root/trunk/AE-go_GameServer/data/scripts/system/database/mysql5/MySQL5InventoryDAO.java
| 2395 | 2440 | ||
|---|---|---|---|
43 | { | 43 | { |
44 | private static final Logger log = Logger.getLogger(MySQL5InventoryDAO.class); | 44 | private static final Logger log = Logger.getLogger(MySQL5InventoryDAO.class); |
45 | 45 | ||
46 | public static final String SELECT_QUERY = "SELECT `itemUniqueId`, `itemId`, `itemCount`, `itemColor`, `isEquiped`, `isSoulBound`, `slot`, `enchant`, `itemSkin` FROM `inventory` WHERE `itemOwner`=? AND `itemLocation`=? AND `isEquiped`=?"; | 46 | public static final String SELECT_QUERY = "SELECT `itemUniqueId`, `itemId`, `itemCount`, `itemColor`, `isEquiped`, `isSoulBound`, `slot`, `enchant`, `itemSkin`, `fusionedItem` FROM `inventory` WHERE `itemOwner`=? AND `itemLocation`=? AND `isEquiped`=?"; |
47 | public static final String INSERT_QUERY = "INSERT INTO `inventory` (`itemUniqueId`, `itemId`, `itemCount`, `itemColor`, `itemOwner`, `isEquiped`, isSoulBound, `slot`, `itemLocation`, `enchant`, `itemSkin`) VALUES(?,?,?,?,?,?,?,?,?,?, ?)"; | 47 | public static final String INSERT_QUERY = "INSERT INTO `inventory` (`itemUniqueId`, `itemId`, `itemCount`, `itemColor`, `itemOwner`, `isEquiped`, isSoulBound, `slot`, `itemLocation`, `enchant`, `itemSkin`, `fusionedItem`) VALUES(?,?,?,?,?,?,?,?,?,?, ?,?)"; |
48 | public static final String UPDATE_QUERY = "UPDATE inventory SET itemCount=?, itemColor=?, itemOwner=?, isEquiped=?, isSoulBound=?, slot=?, itemLocation=?, enchant=?, itemSkin=? WHERE itemUniqueId=?"; | 48 | public static final String UPDATE_QUERY = "UPDATE inventory SET itemCount=?, itemColor=?, itemOwner=?, isEquiped=?, isSoulBound=?, slot=?, itemLocation=?, enchant=?, itemSkin=?, fusionedItem=? WHERE itemUniqueId=?"; |
49 | public static final String DELETE_QUERY = "DELETE FROM inventory WHERE itemUniqueId=?"; | 49 | public static final String DELETE_QUERY = "DELETE FROM inventory WHERE itemUniqueId=?"; |
50 | public static final String DELETE_CLEAN_QUERY = "DELETE FROM inventory WHERE itemOwner=? AND (itemLocation=0 OR itemLocation=1)"; | 50 | public static final String DELETE_CLEAN_QUERY = "DELETE FROM inventory WHERE itemOwner=? AND (itemLocation=0 OR itemLocation=1)"; |
51 | public static final String SELECT_ACCOUNT_QUERY = "SELECT `account_id` FROM `players` WHERE `id`=?"; | 51 | public static final String SELECT_ACCOUNT_QUERY = "SELECT `account_id` FROM `players` WHERE `id`=?"; |
... | ... | ||
84 | int slot = rset.getInt("slot"); | 84 | int slot = rset.getInt("slot"); |
85 | int enchant = rset.getInt("enchant"); | 85 | int enchant = rset.getInt("enchant"); |
86 | int itemSkin = rset.getInt("itemSkin"); | 86 | int itemSkin = rset.getInt("itemSkin"); |
87 | Item item = new Item(itemUniqueId, itemId, itemCount, itemColor, isEquiped == 1, isSoulBound == 1,slot, storage, enchant, itemSkin); | 87 | int fusionedItem = rset.getInt("fusionedItem"); |
88 | Item item = new Item(itemUniqueId, itemId, itemCount, itemColor, isEquiped == 1, isSoulBound == 1,slot, storage, enchant, itemSkin,fusionedItem); | ||
88 | item.setPersistentState(PersistentState.UPDATED); | 89 | item.setPersistentState(PersistentState.UPDATED); |
89 | inventory.onLoadHandler(item); | 90 | inventory.onLoadHandler(item); |
90 | } | 91 | } |
... | ... | ||
131 | int slot = rset.getInt("slot"); | 132 | int slot = rset.getInt("slot"); |
132 | int enchant = rset.getInt("enchant"); | 133 | int enchant = rset.getInt("enchant"); |
133 | int itemSkin = rset.getInt("itemSkin"); | 134 | int itemSkin = rset.getInt("itemSkin"); |
134 | Item item = new Item(itemUniqueId, itemId, itemCount, itemColor, true, isSoulBound == 1, slot, storage, enchant, itemSkin); | 135 | int fusionedItem = rset.getInt("fusionedItem"); |
136 | Item item = new Item(itemUniqueId, itemId, itemCount, itemColor, true, isSoulBound == 1, slot, storage, enchant, itemSkin,fusionedItem); | ||
135 | item.setPersistentState(PersistentState.UPDATED); | 137 | item.setPersistentState(PersistentState.UPDATED); |
136 | equipment.onLoadHandler(item); | 138 | equipment.onLoadHandler(item); |
137 | } | 139 | } |
... | ... | ||
176 | int slot = rset.getInt("slot"); | 178 | int slot = rset.getInt("slot"); |
177 | int enchant = rset.getInt("enchant"); | 179 | int enchant = rset.getInt("enchant"); |
178 | int itemSkin = rset.getInt("itemSkin"); | 180 | int itemSkin = rset.getInt("itemSkin"); |
179 | Item item = new Item(itemUniqueId, itemId, itemCount, itemColor, true, isSoulBound == 1, slot, storage, enchant, itemSkin); | 181 | int fusionedItem = rset.getInt("fusionedItem"); |
182 | Item item = new Item(itemUniqueId, itemId, itemCount, itemColor, true, isSoulBound == 1, slot, storage, enchant, itemSkin,fusionedItem); | ||
180 | items.add(item); | 183 | items.add(item); |
181 | } | 184 | } |
182 | rset.close(); | 185 | rset.close(); |
... | ... | ||
291 | stmt.setInt(9, item.getItemLocation()); | 294 | stmt.setInt(9, item.getItemLocation()); |
292 | stmt.setInt(10, item.getEchantLevel()); | 295 | stmt.setInt(10, item.getEchantLevel()); |
293 | stmt.setInt(11, item.getItemSkinTemplate().getTemplateId()); | 296 | stmt.setInt(11, item.getItemSkinTemplate().getTemplateId()); |
297 | stmt.setInt(12, item.getFusionedItem()); | ||
294 | stmt.execute(); | 298 | stmt.execute(); |
295 | stmt.close(); | 299 | stmt.close(); |
296 | } | 300 | } |
... | ... | ||
326 | stmt.setInt(7, item.getItemLocation()); | 330 | stmt.setInt(7, item.getItemLocation()); |
327 | stmt.setInt(8, item.getEchantLevel()); | 331 | stmt.setInt(8, item.getEchantLevel()); |
328 | stmt.setInt(9, item.getItemSkinTemplate().getTemplateId()); | 332 | stmt.setInt(9, item.getItemSkinTemplate().getTemplateId()); |
329 | stmt.setInt(10, item.getObjectId()); | 333 | stmt.setInt(10, item.getFusionedItem()); |
334 | stmt.setInt(11, item.getObjectId()); | ||
330 | stmt.execute(); | 335 | stmt.execute(); |
331 | stmt.close(); | 336 | stmt.close(); |
332 | } | 337 | } |
Download diff