From 259bde1f0fd297f50b4f4935a040c7784c183e71 Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Mon, 31 Oct 2022 22:18:45 +0000 Subject: [PATCH] Player null collection checks. --- .../java/org/l2jmobius/gameserver/model/actor/Player.java | 6 +++++- .../java/org/l2jmobius/gameserver/model/actor/Player.java | 6 +++++- .../java/org/l2jmobius/gameserver/model/actor/Player.java | 6 +++++- .../java/org/l2jmobius/gameserver/model/actor/Player.java | 6 +++++- .../java/org/l2jmobius/gameserver/model/actor/Player.java | 6 +++++- .../java/org/l2jmobius/gameserver/model/actor/Player.java | 6 +++++- 6 files changed, 30 insertions(+), 6 deletions(-) diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Player.java index 800aa95e9f..739dd99d17 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -14969,7 +14969,11 @@ public class Player extends Playable { while (rset.next()) { - _collections.add(new PlayerCollectionData(rset.getInt("collectionId"), rset.getInt("itemId"), rset.getInt("index"))); + final int collectionId = rset.getInt("collectionId"); + if (CollectionData.getInstance().getCollection(collectionId) != null) + { + _collections.add(new PlayerCollectionData(collectionId, rset.getInt("itemId"), rset.getInt("index"))); + } } } } diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/actor/Player.java index 0d408de556..1fea428608 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -15053,7 +15053,11 @@ public class Player extends Playable { while (rset.next()) { - _collections.add(new PlayerCollectionData(rset.getInt("collectionId"), rset.getInt("itemId"), rset.getInt("index"))); + final int collectionId = rset.getInt("collectionId"); + if (CollectionData.getInstance().getCollection(collectionId) != null) + { + _collections.add(new PlayerCollectionData(collectionId, rset.getInt("itemId"), rset.getInt("index"))); + } } } } diff --git a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/actor/Player.java index 2f5d60cda7..18c53f4e77 100644 --- a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -15096,7 +15096,11 @@ public class Player extends Playable { while (rset.next()) { - _collections.add(new PlayerCollectionData(rset.getInt("collectionId"), rset.getInt("itemId"), rset.getInt("index"))); + final int collectionId = rset.getInt("collectionId"); + if (CollectionData.getInstance().getCollection(collectionId) != null) + { + _collections.add(new PlayerCollectionData(collectionId, rset.getInt("itemId"), rset.getInt("index"))); + } } } } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/Player.java index 1be5a6813d..e9ff1fdaf4 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -15344,7 +15344,11 @@ public class Player extends Playable { while (rset.next()) { - _collections.add(new PlayerCollectionData(rset.getInt("collectionId"), rset.getInt("itemId"), rset.getInt("index"))); + final int collectionId = rset.getInt("collectionId"); + if (CollectionData.getInstance().getCollection(collectionId) != null) + { + _collections.add(new PlayerCollectionData(collectionId, rset.getInt("itemId"), rset.getInt("index"))); + } } } } diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/actor/Player.java index f78147bda7..105701c7b0 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -15638,7 +15638,11 @@ public class Player extends Playable { while (rset.next()) { - _collections.add(new PlayerCollectionData(rset.getInt("collectionId"), rset.getInt("itemId"), rset.getInt("index"))); + final int collectionId = rset.getInt("collectionId"); + if (CollectionData.getInstance().getCollection(collectionId) != null) + { + _collections.add(new PlayerCollectionData(collectionId, rset.getInt("itemId"), rset.getInt("index"))); + } } } } diff --git a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/actor/Player.java index 7ffb8de46a..17782a5549 100644 --- a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -15638,7 +15638,11 @@ public class Player extends Playable { while (rset.next()) { - _collections.add(new PlayerCollectionData(rset.getInt("collectionId"), rset.getInt("itemId"), rset.getInt("index"))); + final int collectionId = rset.getInt("collectionId"); + if (CollectionData.getInstance().getCollection(collectionId) != null) + { + _collections.add(new PlayerCollectionData(collectionId, rset.getInt("itemId"), rset.getInt("index"))); + } } } }