lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed Collection system deletion query from store method.

Browse Source
This commit is contained in:
MobiusDevelopment
2021-07-20 00:38:27 +00:00
parent 349014127c
commit c6700b3fcb
4 changed files with 68 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
View File

@@ -423,7 +423,6 @@ public class PlayerInstance extends Playable
private static final String DELETE_CHAR_SHORTCUTS = "DELETE FROM character_shortcuts WHERE charId=? AND class_index=?"; private static final String DELETE_CHAR_SHORTCUTS = "DELETE FROM character_shortcuts WHERE charId=? AND class_index=?";
// Character Collections list // Character Collections list
private static final String DELETE_COLLECTION = "DELETE FROM collections WHERE accountName=?";
private static final String INSERT_COLLECTION = "REPLACE INTO collections (`accountName`, `itemId`, `collectionId`, `index`) VALUES (?, ?, ?, ?)"; private static final String INSERT_COLLECTION = "REPLACE INTO collections (`accountName`, `itemId`, `collectionId`, `index`) VALUES (?, ?, ?, ?)";
private static final String RESTORE_COLLECTION = "SELECT * FROM collections WHERE accountName=? ORDER BY `index`"; private static final String RESTORE_COLLECTION = "SELECT * FROM collections WHERE accountName=? ORDER BY `index`";
private static final String DELETE_COLLECTION_FAVORITE = "DELETE FROM collection_favorites WHERE accountName=?"; private static final String DELETE_COLLECTION_FAVORITE = "DELETE FROM collection_favorites WHERE accountName=?";
@@ -14517,15 +14516,8 @@ public class PlayerInstance extends Playable
public void storeCollections() public void storeCollections()
{ {
try (Connection con = DatabaseFactory.getConnection()) try (Connection con = DatabaseFactory.getConnection();
{ PreparedStatement st = con.prepareStatement(INSERT_COLLECTION))
try (PreparedStatement st = con.prepareStatement(DELETE_COLLECTION))
{
st.setString(1, getAccountNamePlayer());
st.execute();
}
try (PreparedStatement st = con.prepareStatement(INSERT_COLLECTION))
{ {
_collections.forEach(data -> _collections.forEach(data ->
{ {
@@ -14545,7 +14537,6 @@ public class PlayerInstance extends Playable
st.executeBatch(); st.executeBatch();
con.commit(); con.commit();
} }
}
catch (Exception e) catch (Exception e)
{ {
LOGGER.log(Level.SEVERE, "Could not store collection for playerId " + getObjectId() + ": ", e); LOGGER.log(Level.SEVERE, "Could not store collection for playerId " + getObjectId() + ": ", e);

13
L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
View File

@@ -423,7 +423,6 @@ public class PlayerInstance extends Playable
private static final String DELETE_CHAR_SHORTCUTS = "DELETE FROM character_shortcuts WHERE charId=? AND class_index=?"; private static final String DELETE_CHAR_SHORTCUTS = "DELETE FROM character_shortcuts WHERE charId=? AND class_index=?";
// Character Collections list // Character Collections list
private static final String DELETE_COLLECTION = "DELETE FROM collections WHERE accountName=?";
private static final String INSERT_COLLECTION = "REPLACE INTO collections (`accountName`, `itemId`, `collectionId`, `index`) VALUES (?, ?, ?, ?)"; private static final String INSERT_COLLECTION = "REPLACE INTO collections (`accountName`, `itemId`, `collectionId`, `index`) VALUES (?, ?, ?, ?)";
private static final String RESTORE_COLLECTION = "SELECT * FROM collections WHERE accountName=? ORDER BY `index`"; private static final String RESTORE_COLLECTION = "SELECT * FROM collections WHERE accountName=? ORDER BY `index`";
private static final String DELETE_COLLECTION_FAVORITE = "DELETE FROM collection_favorites WHERE accountName=?"; private static final String DELETE_COLLECTION_FAVORITE = "DELETE FROM collection_favorites WHERE accountName=?";
@@ -14517,15 +14516,8 @@ public class PlayerInstance extends Playable
public void storeCollections() public void storeCollections()
{ {
try (Connection con = DatabaseFactory.getConnection()) try (Connection con = DatabaseFactory.getConnection();
{ PreparedStatement st = con.prepareStatement(INSERT_COLLECTION))
try (PreparedStatement st = con.prepareStatement(DELETE_COLLECTION))
{
st.setString(1, getAccountNamePlayer());
st.execute();
}
try (PreparedStatement st = con.prepareStatement(INSERT_COLLECTION))
{ {
_collections.forEach(data -> _collections.forEach(data ->
{ {
@@ -14545,7 +14537,6 @@ public class PlayerInstance extends Playable
st.executeBatch(); st.executeBatch();
con.commit(); con.commit();
} }
}
catch (Exception e) catch (Exception e)
{ {
LOGGER.log(Level.SEVERE, "Could not store collection for playerId " + getObjectId() + ": ", e); LOGGER.log(Level.SEVERE, "Could not store collection for playerId " + getObjectId() + ": ", e);

13
L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
View File

@@ -439,7 +439,6 @@ public class PlayerInstance extends Playable
private static final String DELETE_CHAR_SHORTCUTS = "DELETE FROM character_shortcuts WHERE charId=? AND class_index=?"; private static final String DELETE_CHAR_SHORTCUTS = "DELETE FROM character_shortcuts WHERE charId=? AND class_index=?";
// Character Collections list: // Character Collections list:
private static final String DELETE_COLLECTION = "DELETE FROM collections WHERE accountName=?";
private static final String INSERT_COLLECTION = "REPLACE INTO collections (`accountName`, `itemId`, `collectionId`, `index`) VALUES (?, ?, ?, ?)"; private static final String INSERT_COLLECTION = "REPLACE INTO collections (`accountName`, `itemId`, `collectionId`, `index`) VALUES (?, ?, ?, ?)";
private static final String RESTORE_COLLECTION = "SELECT * FROM collections WHERE accountName=? ORDER BY `index`"; private static final String RESTORE_COLLECTION = "SELECT * FROM collections WHERE accountName=? ORDER BY `index`";
private static final String DELETE_COLLECTION_FAVORITE = "DELETE FROM collection_favorites WHERE accountName=?"; private static final String DELETE_COLLECTION_FAVORITE = "DELETE FROM collection_favorites WHERE accountName=?";
@@ -14778,15 +14777,8 @@ public class PlayerInstance extends Playable
public void storeCollections() public void storeCollections()
{ {
try (Connection con = DatabaseFactory.getConnection()) try (Connection con = DatabaseFactory.getConnection();
{ PreparedStatement st = con.prepareStatement(INSERT_COLLECTION))
try (PreparedStatement st = con.prepareStatement(DELETE_COLLECTION))
{
st.setString(1, getAccountNamePlayer());
st.execute();
}
try (PreparedStatement st = con.prepareStatement(INSERT_COLLECTION))
{ {
_collections.forEach(data -> _collections.forEach(data ->
{ {
@@ -14806,7 +14798,6 @@ public class PlayerInstance extends Playable
st.executeBatch(); st.executeBatch();
con.commit(); con.commit();
} }
}
catch (Exception e) catch (Exception e)
{ {
LOGGER.log(Level.SEVERE, "Could not store collection for playerId " + getObjectId() + ": ", e); LOGGER.log(Level.SEVERE, "Could not store collection for playerId " + getObjectId() + ": ", e);

13
L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
View File

@@ -439,7 +439,6 @@ public class PlayerInstance extends Playable
private static final String DELETE_CHAR_SHORTCUTS = "DELETE FROM character_shortcuts WHERE charId=? AND class_index=?"; private static final String DELETE_CHAR_SHORTCUTS = "DELETE FROM character_shortcuts WHERE charId=? AND class_index=?";
// Character Collections list: // Character Collections list:
private static final String DELETE_COLLECTION = "DELETE FROM collections WHERE accountName=?";
private static final String INSERT_COLLECTION = "REPLACE INTO collections (`accountName`, `itemId`, `collectionId`, `index`) VALUES (?, ?, ?, ?)"; private static final String INSERT_COLLECTION = "REPLACE INTO collections (`accountName`, `itemId`, `collectionId`, `index`) VALUES (?, ?, ?, ?)";
private static final String RESTORE_COLLECTION = "SELECT * FROM collections WHERE accountName=? ORDER BY `index`"; private static final String RESTORE_COLLECTION = "SELECT * FROM collections WHERE accountName=? ORDER BY `index`";
private static final String DELETE_COLLECTION_FAVORITE = "DELETE FROM collection_favorites WHERE accountName=?"; private static final String DELETE_COLLECTION_FAVORITE = "DELETE FROM collection_favorites WHERE accountName=?";
@@ -14778,15 +14777,8 @@ public class PlayerInstance extends Playable
public void storeCollections() public void storeCollections()
{ {
try (Connection con = DatabaseFactory.getConnection()) try (Connection con = DatabaseFactory.getConnection();
{ PreparedStatement st = con.prepareStatement(INSERT_COLLECTION))
try (PreparedStatement st = con.prepareStatement(DELETE_COLLECTION))
{
st.setString(1, getAccountNamePlayer());
st.execute();
}
try (PreparedStatement st = con.prepareStatement(INSERT_COLLECTION))
{ {
_collections.forEach(data -> _collections.forEach(data ->
{ {
@@ -14806,7 +14798,6 @@ public class PlayerInstance extends Playable
st.executeBatch(); st.executeBatch();
con.commit(); con.commit();
} }
}
catch (Exception e) catch (Exception e)
{ {
LOGGER.log(Level.SEVERE, "Could not store collection for playerId " + getObjectId() + ": ", e); LOGGER.log(Level.SEVERE, "Could not store collection for playerId " + getObjectId() + ": ", e);