root/trunk/AE-go_GameServer/data/scripts/system/database/mysql5/MySQL5LegionDAO.java
| 2214 | 2440 | ||
|---|---|---|---|
71 | private static final String SELECT_EMBLEM_QUERY = "SELECT * FROM legion_emblems WHERE legion_id=?"; | 71 | private static final String SELECT_EMBLEM_QUERY = "SELECT * FROM legion_emblems WHERE legion_id=?"; |
72 | 72 | ||
73 | /** Storage Queries **/ | 73 | /** Storage Queries **/ |
74 | private static final String SELECT_STORAGE_QUERY = "SELECT `itemUniqueId`, `itemId`, `itemCount`, `itemColor`, `isEquiped`, `slot`, `enchant`, `itemSkin` FROM `inventory` WHERE `itemOwner`=? AND `itemLocation`=? AND `isEquiped`=?"; | 74 | private static final String SELECT_STORAGE_QUERY = "SELECT `itemUniqueId`, `itemId`, `itemCount`, `itemColor`, `isEquiped`, `slot`, `enchant`, `itemSkin`, `fusionedItem` FROM `inventory` WHERE `itemOwner`=? AND `itemLocation`=? AND `isEquiped`=?"; |
75 | 75 | ||
76 | /** History Queries **/ | 76 | /** History Queries **/ |
77 | private static final String INSERT_HISTORY_QUERY = "INSERT INTO legion_history(`legion_id`, `date`, `history_type`, `name`) VALUES (?, ?, ?, ?)"; | 77 | private static final String INSERT_HISTORY_QUERY = "INSERT INTO legion_history(`legion_id`, `date`, `history_type`, `name`) VALUES (?, ?, ?, ?)"; |
... | ... | ||
484 | int slot = rset.getInt("slot"); | 484 | int slot = rset.getInt("slot"); |
485 | int enchant = rset.getInt("enchant"); | 485 | int enchant = rset.getInt("enchant"); |
486 | int itemSkin = rset.getInt("itemSkin"); | 486 | int itemSkin = rset.getInt("itemSkin"); |
487 | Item item = new Item(itemUniqueId, itemId, itemCount, itemColor, isEquiped == 1, false, slot, storage, enchant, itemSkin); | 487 | int fusionedItem = rset.getInt("fusionedItem"); |
488 | Item item = new Item(itemUniqueId, itemId, itemCount, itemColor, isEquiped == 1, false, slot, storage, enchant, itemSkin,fusionedItem); | ||
488 | item.setPersistentState(PersistentState.UPDATED); | 489 | item.setPersistentState(PersistentState.UPDATED); |
489 | inventory.onLoadHandler(item); | 490 | inventory.onLoadHandler(item); |
490 | } | 491 | } |
Download diff