Replaced CrestTable ResultSet deleteRow with removeCrest method.

L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/sql/CrestTable.java

@@ -78,7 +78,6 @@ public class CrestTable
 			while (rs.next())
 			{
 				final int id = rs.getInt("crest_id");
-				
 				if (_nextId.get() <= id)
 				{
 					_nextId.set(id + 1);
@@ -88,7 +87,7 @@ public class CrestTable
 				// a crest id because client will display wrong crest if its reused
 				if (!crestsInUse.contains(id) && (id != (_nextId.get() - 1)))
 				{
-					rs.deleteRow();
+					removeCrest(id);
 					continue;
 				}
 				
@@ -187,7 +186,7 @@ public class CrestTable
 		}
 		
 		try (Connection con = DatabaseFactory.getConnection();
-			PreparedStatement statement = con.prepareStatement("DELETE FROM `crests` WHERE `crest_id` = ?"))
+			PreparedStatement statement = con.prepareStatement("DELETE FROM `crests` WHERE `crest_id`=?"))
 		{
 			statement.setInt(1, crestId);
 			statement.executeUpdate();

L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/sql/CrestTable.java

@@ -78,7 +78,6 @@ public class CrestTable
 			while (rs.next())
 			{
 				final int id = rs.getInt("crest_id");
-				
 				if (_nextId.get() <= id)
 				{
 					_nextId.set(id + 1);
@@ -88,7 +87,7 @@ public class CrestTable
 				// a crest id because client will display wrong crest if its reused
 				if (!crestsInUse.contains(id) && (id != (_nextId.get() - 1)))
 				{
-					rs.deleteRow();
+					removeCrest(id);
 					continue;
 				}
 				
@@ -187,7 +186,7 @@ public class CrestTable
 		}
 		
 		try (Connection con = DatabaseFactory.getConnection();
-			PreparedStatement statement = con.prepareStatement("DELETE FROM `crests` WHERE `crest_id` = ?"))
+			PreparedStatement statement = con.prepareStatement("DELETE FROM `crests` WHERE `crest_id`=?"))
 		{
 			statement.setInt(1, crestId);
 			statement.executeUpdate();

L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/sql/CrestTable.java

@@ -78,7 +78,6 @@ public class CrestTable
 			while (rs.next())
 			{
 				final int id = rs.getInt("crest_id");
-				
 				if (_nextId.get() <= id)
 				{
 					_nextId.set(id + 1);
@@ -88,7 +87,7 @@ public class CrestTable
 				// a crest id because client will display wrong crest if its reused
 				if (!crestsInUse.contains(id) && (id != (_nextId.get() - 1)))
 				{
-					rs.deleteRow();
+					removeCrest(id);
 					continue;
 				}
 				
@@ -187,7 +186,7 @@ public class CrestTable
 		}
 		
 		try (Connection con = DatabaseFactory.getConnection();
-			PreparedStatement statement = con.prepareStatement("DELETE FROM `crests` WHERE `crest_id` = ?"))
+			PreparedStatement statement = con.prepareStatement("DELETE FROM `crests` WHERE `crest_id`=?"))
 		{
 			statement.setInt(1, crestId);
 			statement.executeUpdate();

L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/sql/CrestTable.java

@@ -78,7 +78,6 @@ public class CrestTable
 			while (rs.next())
 			{
 				final int id = rs.getInt("crest_id");
-				
 				if (_nextId.get() <= id)
 				{
 					_nextId.set(id + 1);
@@ -88,7 +87,7 @@ public class CrestTable
 				// a crest id because client will display wrong crest if its reused
 				if (!crestsInUse.contains(id) && (id != (_nextId.get() - 1)))
 				{
-					rs.deleteRow();
+					removeCrest(id);
 					continue;
 				}
 				
@@ -187,7 +186,7 @@ public class CrestTable
 		}
 		
 		try (Connection con = DatabaseFactory.getConnection();
-			PreparedStatement statement = con.prepareStatement("DELETE FROM `crests` WHERE `crest_id` = ?"))
+			PreparedStatement statement = con.prepareStatement("DELETE FROM `crests` WHERE `crest_id`=?"))
 		{
 			statement.setInt(1, crestId);
 			statement.executeUpdate();

L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/sql/CrestTable.java

@@ -78,7 +78,6 @@ public class CrestTable
 			while (rs.next())
 			{
 				final int id = rs.getInt("crest_id");
-				
 				if (_nextId.get() <= id)
 				{
 					_nextId.set(id + 1);
@@ -88,7 +87,7 @@ public class CrestTable
 				// a crest id because client will display wrong crest if its reused
 				if (!crestsInUse.contains(id) && (id != (_nextId.get() - 1)))
 				{
-					rs.deleteRow();
+					removeCrest(id);
 					continue;
 				}
 				
@@ -187,7 +186,7 @@ public class CrestTable
 		}
 		
 		try (Connection con = DatabaseFactory.getConnection();
-			PreparedStatement statement = con.prepareStatement("DELETE FROM `crests` WHERE `crest_id` = ?"))
+			PreparedStatement statement = con.prepareStatement("DELETE FROM `crests` WHERE `crest_id`=?"))
 		{
 			statement.setInt(1, crestId);
 			statement.executeUpdate();

L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/sql/CrestTable.java

@@ -78,7 +78,6 @@ public class CrestTable
 			while (rs.next())
 			{
 				final int id = rs.getInt("crest_id");
-				
 				if (_nextId.get() <= id)
 				{
 					_nextId.set(id + 1);
@@ -88,7 +87,7 @@ public class CrestTable
 				// a crest id because client will display wrong crest if its reused
 				if (!crestsInUse.contains(id) && (id != (_nextId.get() - 1)))
 				{
-					rs.deleteRow();
+					removeCrest(id);
 					continue;
 				}
 				
@@ -187,7 +186,7 @@ public class CrestTable
 		}
 		
 		try (Connection con = DatabaseFactory.getConnection();
-			PreparedStatement statement = con.prepareStatement("DELETE FROM `crests` WHERE `crest_id` = ?"))
+			PreparedStatement statement = con.prepareStatement("DELETE FROM `crests` WHERE `crest_id`=?"))
 		{
 			statement.setInt(1, crestId);
 			statement.executeUpdate();

L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/sql/CrestTable.java

@@ -78,7 +78,6 @@ public class CrestTable
 			while (rs.next())
 			{
 				final int id = rs.getInt("crest_id");
-				
 				if (_nextId.get() <= id)
 				{
 					_nextId.set(id + 1);
@@ -88,7 +87,7 @@ public class CrestTable
 				// a crest id because client will display wrong crest if its reused
 				if (!crestsInUse.contains(id) && (id != (_nextId.get() - 1)))
 				{
-					rs.deleteRow();
+					removeCrest(id);
 					continue;
 				}
 				
@@ -187,7 +186,7 @@ public class CrestTable
 		}
 		
 		try (Connection con = DatabaseFactory.getConnection();
-			PreparedStatement statement = con.prepareStatement("DELETE FROM `crests` WHERE `crest_id` = ?"))
+			PreparedStatement statement = con.prepareStatement("DELETE FROM `crests` WHERE `crest_id`=?"))
 		{
 			statement.setInt(1, crestId);
 			statement.executeUpdate();

L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/sql/CrestTable.java

@@ -78,7 +78,6 @@ public class CrestTable
 			while (rs.next())
 			{
 				final int id = rs.getInt("crest_id");
-				
 				if (_nextId.get() <= id)
 				{
 					_nextId.set(id + 1);
@@ -88,7 +87,7 @@ public class CrestTable
 				// a crest id because client will display wrong crest if its reused
 				if (!crestsInUse.contains(id) && (id != (_nextId.get() - 1)))
 				{
-					rs.deleteRow();
+					removeCrest(id);
 					continue;
 				}
 				
@@ -187,7 +186,7 @@ public class CrestTable
 		}
 		
 		try (Connection con = DatabaseFactory.getConnection();
-			PreparedStatement statement = con.prepareStatement("DELETE FROM `crests` WHERE `crest_id` = ?"))
+			PreparedStatement statement = con.prepareStatement("DELETE FROM `crests` WHERE `crest_id`=?"))
 		{
 			statement.setInt(1, crestId);
 			statement.executeUpdate();

L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/sql/CrestTable.java

@@ -78,7 +78,6 @@ public class CrestTable
 			while (rs.next())
 			{
 				final int id = rs.getInt("crest_id");
-				
 				if (_nextId.get() <= id)
 				{
 					_nextId.set(id + 1);
@@ -88,7 +87,7 @@ public class CrestTable
 				// a crest id because client will display wrong crest if its reused
 				if (!crestsInUse.contains(id) && (id != (_nextId.get() - 1)))
 				{
-					rs.deleteRow();
+					removeCrest(id);
 					continue;
 				}
 				
@@ -187,7 +186,7 @@ public class CrestTable
 		}
 		
 		try (Connection con = DatabaseFactory.getConnection();
-			PreparedStatement statement = con.prepareStatement("DELETE FROM `crests` WHERE `crest_id` = ?"))
+			PreparedStatement statement = con.prepareStatement("DELETE FROM `crests` WHERE `crest_id`=?"))
 		{
 			statement.setInt(1, crestId);
 			statement.executeUpdate();

L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/sql/CrestTable.java

@@ -78,7 +78,6 @@ public class CrestTable
 			while (rs.next())
 			{
 				final int id = rs.getInt("crest_id");
-				
 				if (_nextId.get() <= id)
 				{
 					_nextId.set(id + 1);
@@ -88,7 +87,7 @@ public class CrestTable
 				// a crest id because client will display wrong crest if its reused
 				if (!crestsInUse.contains(id) && (id != (_nextId.get() - 1)))
 				{
-					rs.deleteRow();
+					removeCrest(id);
 					continue;
 				}
 				
@@ -187,7 +186,7 @@ public class CrestTable
 		}
 		
 		try (Connection con = DatabaseFactory.getConnection();
-			PreparedStatement statement = con.prepareStatement("DELETE FROM `crests` WHERE `crest_id` = ?"))
+			PreparedStatement statement = con.prepareStatement("DELETE FROM `crests` WHERE `crest_id`=?"))
 		{
 			statement.setInt(1, crestId);
 			statement.executeUpdate();

L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/data/sql/CrestTable.java

@@ -78,7 +78,6 @@ public class CrestTable
 			while (rs.next())
 			{
 				final int id = rs.getInt("crest_id");
-				
 				if (_nextId.get() <= id)
 				{
 					_nextId.set(id + 1);
@@ -88,7 +87,7 @@ public class CrestTable
 				// a crest id because client will display wrong crest if its reused
 				if (!crestsInUse.contains(id) && (id != (_nextId.get() - 1)))
 				{
-					rs.deleteRow();
+					removeCrest(id);
 					continue;
 				}
 				
@@ -187,7 +186,7 @@ public class CrestTable
 		}
 		
 		try (Connection con = DatabaseFactory.getConnection();
-			PreparedStatement statement = con.prepareStatement("DELETE FROM `crests` WHERE `crest_id` = ?"))
+			PreparedStatement statement = con.prepareStatement("DELETE FROM `crests` WHERE `crest_id`=?"))
 		{
 			statement.setInt(1, crestId);
 			statement.executeUpdate();

L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/data/sql/CrestTable.java

@@ -78,7 +78,6 @@ public class CrestTable
 			while (rs.next())
 			{
 				final int id = rs.getInt("crest_id");
-				
 				if (_nextId.get() <= id)
 				{
 					_nextId.set(id + 1);
@@ -88,7 +87,7 @@ public class CrestTable
 				// a crest id because client will display wrong crest if its reused
 				if (!crestsInUse.contains(id) && (id != (_nextId.get() - 1)))
 				{
-					rs.deleteRow();
+					removeCrest(id);
 					continue;
 				}
 				
@@ -187,7 +186,7 @@ public class CrestTable
 		}
 		
 		try (Connection con = DatabaseFactory.getConnection();
-			PreparedStatement statement = con.prepareStatement("DELETE FROM `crests` WHERE `crest_id` = ?"))
+			PreparedStatement statement = con.prepareStatement("DELETE FROM `crests` WHERE `crest_id`=?"))
 		{
 			statement.setInt(1, crestId);
 			statement.executeUpdate();

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/data/sql/CrestTable.java

@@ -78,7 +78,6 @@ public class CrestTable
 			while (rs.next())
 			{
 				final int id = rs.getInt("crest_id");
-				
 				if (_nextId.get() <= id)
 				{
 					_nextId.set(id + 1);
@@ -88,7 +87,7 @@ public class CrestTable
 				// a crest id because client will display wrong crest if its reused
 				if (!crestsInUse.contains(id) && (id != (_nextId.get() - 1)))
 				{
-					rs.deleteRow();
+					removeCrest(id);
 					continue;
 				}
 				
@@ -187,7 +186,7 @@ public class CrestTable
 		}
 		
 		try (Connection con = DatabaseFactory.getConnection();
-			PreparedStatement statement = con.prepareStatement("DELETE FROM `crests` WHERE `crest_id` = ?"))
+			PreparedStatement statement = con.prepareStatement("DELETE FROM `crests` WHERE `crest_id`=?"))
 		{
 			statement.setInt(1, crestId);
 			statement.executeUpdate();

L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/sql/CrestTable.java

@@ -78,7 +78,6 @@ public class CrestTable
 			while (rs.next())
 			{
 				final int id = rs.getInt("crest_id");
-				
 				if (_nextId.get() <= id)
 				{
 					_nextId.set(id + 1);
@@ -88,7 +87,7 @@ public class CrestTable
 				// a crest id because client will display wrong crest if its reused
 				if (!crestsInUse.contains(id) && (id != (_nextId.get() - 1)))
 				{
-					rs.deleteRow();
+					removeCrest(id);
 					continue;
 				}
 				
@@ -187,7 +186,7 @@ public class CrestTable
 		}
 		
 		try (Connection con = DatabaseFactory.getConnection();
-			PreparedStatement statement = con.prepareStatement("DELETE FROM `crests` WHERE `crest_id` = ?"))
+			PreparedStatement statement = con.prepareStatement("DELETE FROM `crests` WHERE `crest_id`=?"))
 		{
 			statement.setInt(1, crestId);
 			statement.executeUpdate();

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/sql/CrestTable.java

@@ -78,7 +78,6 @@ public class CrestTable
 			while (rs.next())
 			{
 				final int id = rs.getInt("crest_id");
-				
 				if (_nextId.get() <= id)
 				{
 					_nextId.set(id + 1);
@@ -88,7 +87,7 @@ public class CrestTable
 				// a crest id because client will display wrong crest if its reused
 				if (!crestsInUse.contains(id) && (id != (_nextId.get() - 1)))
 				{
-					rs.deleteRow();
+					removeCrest(id);
 					continue;
 				}
 				
@@ -187,7 +186,7 @@ public class CrestTable
 		}
 		
 		try (Connection con = DatabaseFactory.getConnection();
-			PreparedStatement statement = con.prepareStatement("DELETE FROM `crests` WHERE `crest_id` = ?"))
+			PreparedStatement statement = con.prepareStatement("DELETE FROM `crests` WHERE `crest_id`=?"))
 		{
 			statement.setInt(1, crestId);
 			statement.executeUpdate();

L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/sql/CrestTable.java

@@ -78,7 +78,6 @@ public class CrestTable
 			while (rs.next())
 			{
 				final int id = rs.getInt("crest_id");
-				
 				if (_nextId.get() <= id)
 				{
 					_nextId.set(id + 1);
@@ -88,7 +87,7 @@ public class CrestTable
 				// a crest id because client will display wrong crest if its reused
 				if (!crestsInUse.contains(id) && (id != (_nextId.get() - 1)))
 				{
-					rs.deleteRow();
+					removeCrest(id);
 					continue;
 				}
 				
@@ -187,7 +186,7 @@ public class CrestTable
 		}
 		
 		try (Connection con = DatabaseFactory.getConnection();
-			PreparedStatement statement = con.prepareStatement("DELETE FROM `crests` WHERE `crest_id` = ?"))
+			PreparedStatement statement = con.prepareStatement("DELETE FROM `crests` WHERE `crest_id`=?"))
 		{
 			statement.setInt(1, crestId);
 			statement.executeUpdate();

L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/sql/CrestTable.java

@@ -78,7 +78,6 @@ public class CrestTable
 			while (rs.next())
 			{
 				final int id = rs.getInt("crest_id");
-				
 				if (_nextId.get() <= id)
 				{
 					_nextId.set(id + 1);
@@ -88,7 +87,7 @@ public class CrestTable
 				// a crest id because client will display wrong crest if its reused
 				if (!crestsInUse.contains(id) && (id != (_nextId.get() - 1)))
 				{
-					rs.deleteRow();
+					removeCrest(id);
 					continue;
 				}
 				
@@ -187,7 +186,7 @@ public class CrestTable
 		}
 		
 		try (Connection con = DatabaseFactory.getConnection();
-			PreparedStatement statement = con.prepareStatement("DELETE FROM `crests` WHERE `crest_id` = ?"))
+			PreparedStatement statement = con.prepareStatement("DELETE FROM `crests` WHERE `crest_id`=?"))
 		{
 			statement.setInt(1, crestId);
 			statement.executeUpdate();

L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/sql/CrestTable.java

@@ -78,7 +78,6 @@ public class CrestTable
 			while (rs.next())
 			{
 				final int id = rs.getInt("crest_id");
-				
 				if (_nextId.get() <= id)
 				{
 					_nextId.set(id + 1);
@@ -88,7 +87,7 @@ public class CrestTable
 				// a crest id because client will display wrong crest if its reused
 				if (!crestsInUse.contains(id) && (id != (_nextId.get() - 1)))
 				{
-					rs.deleteRow();
+					removeCrest(id);
 					continue;
 				}
 				
@@ -187,7 +186,7 @@ public class CrestTable
 		}
 		
 		try (Connection con = DatabaseFactory.getConnection();
-			PreparedStatement statement = con.prepareStatement("DELETE FROM `crests` WHERE `crest_id` = ?"))
+			PreparedStatement statement = con.prepareStatement("DELETE FROM `crests` WHERE `crest_id`=?"))
 		{
 			statement.setInt(1, crestId);
 			statement.executeUpdate();

L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/sql/CrestTable.java

@@ -78,7 +78,6 @@ public class CrestTable
 			while (rs.next())
 			{
 				final int id = rs.getInt("crest_id");
-				
 				if (_nextId.get() <= id)
 				{
 					_nextId.set(id + 1);
@@ -88,7 +87,7 @@ public class CrestTable
 				// a crest id because client will display wrong crest if its reused
 				if (!crestsInUse.contains(id) && (id != (_nextId.get() - 1)))
 				{
-					rs.deleteRow();
+					removeCrest(id);
 					continue;
 				}
 				
@@ -187,7 +186,7 @@ public class CrestTable
 		}
 		
 		try (Connection con = DatabaseFactory.getConnection();
-			PreparedStatement statement = con.prepareStatement("DELETE FROM `crests` WHERE `crest_id` = ?"))
+			PreparedStatement statement = con.prepareStatement("DELETE FROM `crests` WHERE `crest_id`=?"))
 		{
 			statement.setInt(1, crestId);
 			statement.executeUpdate();

L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/sql/CrestTable.java

@@ -78,7 +78,6 @@ public class CrestTable
 			while (rs.next())
 			{
 				final int id = rs.getInt("crest_id");
-				
 				if (_nextId.get() <= id)
 				{
 					_nextId.set(id + 1);
@@ -88,7 +87,7 @@ public class CrestTable
 				// a crest id because client will display wrong crest if its reused
 				if (!crestsInUse.contains(id) && (id != (_nextId.get() - 1)))
 				{
-					rs.deleteRow();
+					removeCrest(id);
 					continue;
 				}
 				
@@ -187,7 +186,7 @@ public class CrestTable
 		}
 		
 		try (Connection con = DatabaseFactory.getConnection();
-			PreparedStatement statement = con.prepareStatement("DELETE FROM `crests` WHERE `crest_id` = ?"))
+			PreparedStatement statement = con.prepareStatement("DELETE FROM `crests` WHERE `crest_id`=?"))
 		{
 			statement.setInt(1, crestId);
 			statement.executeUpdate();

L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/sql/CrestTable.java

@@ -78,7 +78,6 @@ public class CrestTable
 			while (rs.next())
 			{
 				final int id = rs.getInt("crest_id");
-				
 				if (_nextId.get() <= id)
 				{
 					_nextId.set(id + 1);
@@ -88,7 +87,7 @@ public class CrestTable
 				// a crest id because client will display wrong crest if its reused
 				if (!crestsInUse.contains(id) && (id != (_nextId.get() - 1)))
 				{
-					rs.deleteRow();
+					removeCrest(id);
 					continue;
 				}
 				
@@ -187,7 +186,7 @@ public class CrestTable
 		}
 		
 		try (Connection con = DatabaseFactory.getConnection();
-			PreparedStatement statement = con.prepareStatement("DELETE FROM `crests` WHERE `crest_id` = ?"))
+			PreparedStatement statement = con.prepareStatement("DELETE FROM `crests` WHERE `crest_id`=?"))
 		{
 			statement.setInt(1, crestId);
 			statement.executeUpdate();

L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/sql/CrestTable.java

@@ -78,7 +78,6 @@ public class CrestTable
 			while (rs.next())
 			{
 				final int id = rs.getInt("crest_id");
-				
 				if (_nextId.get() <= id)
 				{
 					_nextId.set(id + 1);
@@ -88,7 +87,7 @@ public class CrestTable
 				// a crest id because client will display wrong crest if its reused
 				if (!crestsInUse.contains(id) && (id != (_nextId.get() - 1)))
 				{
-					rs.deleteRow();
+					removeCrest(id);
 					continue;
 				}
 				
@@ -187,7 +186,7 @@ public class CrestTable
 		}
 		
 		try (Connection con = DatabaseFactory.getConnection();
-			PreparedStatement statement = con.prepareStatement("DELETE FROM `crests` WHERE `crest_id` = ?"))
+			PreparedStatement statement = con.prepareStatement("DELETE FROM `crests` WHERE `crest_id`=?"))
 		{
 			statement.setInt(1, crestId);
 			statement.executeUpdate();

L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/sql/CrestTable.java

@@ -78,7 +78,6 @@ public class CrestTable
 			while (rs.next())
 			{
 				final int id = rs.getInt("crest_id");
-				
 				if (_nextId.get() <= id)
 				{
 					_nextId.set(id + 1);
@@ -88,7 +87,7 @@ public class CrestTable
 				// a crest id because client will display wrong crest if its reused
 				if (!crestsInUse.contains(id) && (id != (_nextId.get() - 1)))
 				{
-					rs.deleteRow();
+					removeCrest(id);
 					continue;
 				}
 				
@@ -187,7 +186,7 @@ public class CrestTable
 		}
 		
 		try (Connection con = DatabaseFactory.getConnection();
-			PreparedStatement statement = con.prepareStatement("DELETE FROM `crests` WHERE `crest_id` = ?"))
+			PreparedStatement statement = con.prepareStatement("DELETE FROM `crests` WHERE `crest_id`=?"))
 		{
 			statement.setInt(1, crestId);
 			statement.executeUpdate();

L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/sql/CrestTable.java

@@ -78,7 +78,6 @@ public class CrestTable
 			while (rs.next())
 			{
 				final int id = rs.getInt("crest_id");
-				
 				if (_nextId.get() <= id)
 				{
 					_nextId.set(id + 1);
@@ -88,7 +87,7 @@ public class CrestTable
 				// a crest id because client will display wrong crest if its reused
 				if (!crestsInUse.contains(id) && (id != (_nextId.get() - 1)))
 				{
-					rs.deleteRow();
+					removeCrest(id);
 					continue;
 				}
 				
@@ -187,7 +186,7 @@ public class CrestTable
 		}
 		
 		try (Connection con = DatabaseFactory.getConnection();
-			PreparedStatement statement = con.prepareStatement("DELETE FROM `crests` WHERE `crest_id` = ?"))
+			PreparedStatement statement = con.prepareStatement("DELETE FROM `crests` WHERE `crest_id`=?"))
 		{
 			statement.setInt(1, crestId);
 			statement.executeUpdate();

L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/data/sql/CrestTable.java

@@ -78,7 +78,6 @@ public class CrestTable
 			while (rs.next())
 			{
 				final int id = rs.getInt("crest_id");
-				
 				if (_nextId.get() <= id)
 				{
 					_nextId.set(id + 1);
@@ -88,7 +87,7 @@ public class CrestTable
 				// a crest id because client will display wrong crest if its reused
 				if (!crestsInUse.contains(id) && (id != (_nextId.get() - 1)))
 				{
-					rs.deleteRow();
+					removeCrest(id);
 					continue;
 				}
 				
@@ -187,7 +186,7 @@ public class CrestTable
 		}
 		
 		try (Connection con = DatabaseFactory.getConnection();
-			PreparedStatement statement = con.prepareStatement("DELETE FROM `crests` WHERE `crest_id` = ?"))
+			PreparedStatement statement = con.prepareStatement("DELETE FROM `crests` WHERE `crest_id`=?"))
 		{
 			statement.setInt(1, crestId);
 			statement.executeUpdate();