From 2d939006bc82feb0996f3ab27b0f5b774fe8ae58 Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Tue, 28 Dec 2021 01:54:17 +0000 Subject: [PATCH] Prevent broadcastModifiedStats iterating changed stat when info is null. --- .../java/org/l2jmobius/gameserver/model/actor/Creature.java | 4 ++-- .../java/org/l2jmobius/gameserver/model/actor/Creature.java | 4 ++-- .../java/org/l2jmobius/gameserver/model/actor/Creature.java | 4 ++-- .../java/org/l2jmobius/gameserver/model/actor/Creature.java | 4 ++-- .../java/org/l2jmobius/gameserver/model/actor/Creature.java | 4 ++-- .../java/org/l2jmobius/gameserver/model/actor/Creature.java | 4 ++-- .../java/org/l2jmobius/gameserver/model/actor/Creature.java | 4 ++-- .../java/org/l2jmobius/gameserver/model/actor/Creature.java | 4 ++-- .../java/org/l2jmobius/gameserver/model/actor/Creature.java | 4 ++-- .../java/org/l2jmobius/gameserver/model/actor/Creature.java | 4 ++-- .../java/org/l2jmobius/gameserver/model/actor/Creature.java | 4 ++-- .../java/org/l2jmobius/gameserver/model/actor/Creature.java | 4 ++-- .../java/org/l2jmobius/gameserver/model/actor/Creature.java | 4 ++-- .../java/org/l2jmobius/gameserver/model/actor/Creature.java | 4 ++-- .../java/org/l2jmobius/gameserver/model/actor/Creature.java | 4 ++-- .../java/org/l2jmobius/gameserver/model/actor/Creature.java | 4 ++-- .../java/org/l2jmobius/gameserver/model/actor/Creature.java | 4 ++-- .../java/org/l2jmobius/gameserver/model/actor/Creature.java | 4 ++-- .../java/org/l2jmobius/gameserver/model/actor/Creature.java | 4 ++-- .../java/org/l2jmobius/gameserver/model/actor/Creature.java | 4 ++-- .../java/org/l2jmobius/gameserver/model/actor/Creature.java | 4 ++-- 21 files changed, 42 insertions(+), 42 deletions(-) diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Creature.java index 6715760842..ca29f16fca 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -2686,9 +2686,9 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe info = new UserInfo(getActingPlayer(), false); info.addComponentType(UserInfoType.SLOTS, UserInfoType.ENCHANTLEVEL); } - for (Stat stat : changed) + if (info != null) { - if (info != null) + for (Stat stat : changed) { switch (stat) { diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/Creature.java index 6715760842..ca29f16fca 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -2686,9 +2686,9 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe info = new UserInfo(getActingPlayer(), false); info.addComponentType(UserInfoType.SLOTS, UserInfoType.ENCHANTLEVEL); } - for (Stat stat : changed) + if (info != null) { - if (info != null) + for (Stat stat : changed) { switch (stat) { diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/Creature.java index f5e11d70be..6adcaf1a89 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -2686,9 +2686,9 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe info = new UserInfo(getActingPlayer(), false); info.addComponentType(UserInfoType.SLOTS, UserInfoType.ENCHANTLEVEL); } - for (Stat stat : changed) + if (info != null) { - if (info != null) + for (Stat stat : changed) { switch (stat) { diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Creature.java index f5e11d70be..6adcaf1a89 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -2686,9 +2686,9 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe info = new UserInfo(getActingPlayer(), false); info.addComponentType(UserInfoType.SLOTS, UserInfoType.ENCHANTLEVEL); } - for (Stat stat : changed) + if (info != null) { - if (info != null) + for (Stat stat : changed) { switch (stat) { diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Creature.java index 5d70c3c946..ea226b3955 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -2686,9 +2686,9 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe info = new UserInfo(getActingPlayer(), false); info.addComponentType(UserInfoType.SLOTS, UserInfoType.ENCHANTLEVEL); } - for (Stat stat : changed) + if (info != null) { - if (info != null) + for (Stat stat : changed) { switch (stat) { diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Creature.java index 5d70c3c946..ea226b3955 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -2686,9 +2686,9 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe info = new UserInfo(getActingPlayer(), false); info.addComponentType(UserInfoType.SLOTS, UserInfoType.ENCHANTLEVEL); } - for (Stat stat : changed) + if (info != null) { - if (info != null) + for (Stat stat : changed) { switch (stat) { diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Creature.java index 5d70c3c946..ea226b3955 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -2686,9 +2686,9 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe info = new UserInfo(getActingPlayer(), false); info.addComponentType(UserInfoType.SLOTS, UserInfoType.ENCHANTLEVEL); } - for (Stat stat : changed) + if (info != null) { - if (info != null) + for (Stat stat : changed) { switch (stat) { diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Creature.java index b1ac27a6f3..1ccda35fe0 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -2686,9 +2686,9 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe info = new UserInfo(getActingPlayer(), false); info.addComponentType(UserInfoType.SLOTS, UserInfoType.ENCHANTLEVEL); } - for (Stat stat : changed) + if (info != null) { - if (info != null) + for (Stat stat : changed) { switch (stat) { diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/Creature.java index 8c5de5b638..361cce92cf 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -2686,9 +2686,9 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe info = new UserInfo(getActingPlayer(), false); info.addComponentType(UserInfoType.SLOTS, UserInfoType.ENCHANTLEVEL); } - for (Stat stat : changed) + if (info != null) { - if (info != null) + for (Stat stat : changed) { switch (stat) { diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Creature.java index 8c5de5b638..361cce92cf 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -2686,9 +2686,9 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe info = new UserInfo(getActingPlayer(), false); info.addComponentType(UserInfoType.SLOTS, UserInfoType.ENCHANTLEVEL); } - for (Stat stat : changed) + if (info != null) { - if (info != null) + for (Stat stat : changed) { switch (stat) { diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/Creature.java index 5a22a9370a..ed06caecfe 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -2686,9 +2686,9 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe info = new UserInfo(getActingPlayer(), false); info.addComponentType(UserInfoType.SLOTS, UserInfoType.ENCHANTLEVEL); } - for (Stat stat : changed) + if (info != null) { - if (info != null) + for (Stat stat : changed) { switch (stat) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Creature.java index 765fe4e328..fdd395f78d 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -2686,9 +2686,9 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe info = new UserInfo(getActingPlayer(), false); info.addComponentType(UserInfoType.SLOTS, UserInfoType.ENCHANTLEVEL); } - for (Stat stat : changed) + if (info != null) { - if (info != null) + for (Stat stat : changed) { switch (stat) { diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Creature.java index 765fe4e328..fdd395f78d 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -2686,9 +2686,9 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe info = new UserInfo(getActingPlayer(), false); info.addComponentType(UserInfoType.SLOTS, UserInfoType.ENCHANTLEVEL); } - for (Stat stat : changed) + if (info != null) { - if (info != null) + for (Stat stat : changed) { switch (stat) { diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Creature.java index 6350fa73d6..1460357a31 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -2686,9 +2686,9 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe info = new UserInfo(getActingPlayer(), false); info.addComponentType(UserInfoType.SLOTS, UserInfoType.ENCHANTLEVEL); } - for (Stat stat : changed) + if (info != null) { - if (info != null) + for (Stat stat : changed) { switch (stat) { diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Creature.java index adf90c5394..5dd9d46e29 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -2687,9 +2687,9 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe info = new UserInfo(getActingPlayer(), false); info.addComponentType(UserInfoType.SLOTS, UserInfoType.ENCHANTLEVEL); } - for (Stat stat : changed) + if (info != null) { - if (info != null) + for (Stat stat : changed) { switch (stat) { diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Creature.java index adf90c5394..5dd9d46e29 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -2687,9 +2687,9 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe info = new UserInfo(getActingPlayer(), false); info.addComponentType(UserInfoType.SLOTS, UserInfoType.ENCHANTLEVEL); } - for (Stat stat : changed) + if (info != null) { - if (info != null) + for (Stat stat : changed) { switch (stat) { diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Creature.java index 8e7e3eae94..ee0b39b010 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -2687,9 +2687,9 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe info = new UserInfo(getActingPlayer(), false); info.addComponentType(UserInfoType.SLOTS, UserInfoType.ENCHANTLEVEL); } - for (Stat stat : changed) + if (info != null) { - if (info != null) + for (Stat stat : changed) { switch (stat) { diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Creature.java index 765fe4e328..fdd395f78d 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -2686,9 +2686,9 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe info = new UserInfo(getActingPlayer(), false); info.addComponentType(UserInfoType.SLOTS, UserInfoType.ENCHANTLEVEL); } - for (Stat stat : changed) + if (info != null) { - if (info != null) + for (Stat stat : changed) { switch (stat) { diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Creature.java index f05608f3da..4ee3be1dc7 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -2690,9 +2690,9 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe info = new UserInfo(getActingPlayer(), false); info.addComponentType(UserInfoType.SLOTS, UserInfoType.ENCHANTLEVEL); } - for (Stat stat : changed) + if (info != null) { - if (info != null) + for (Stat stat : changed) { switch (stat) { diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/Creature.java index 64dca5bc6b..4902a7489e 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -2697,9 +2697,9 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe info = new UserInfo(getActingPlayer(), false); info.addComponentType(UserInfoType.SLOTS, UserInfoType.ENCHANTLEVEL); } - for (Stat stat : changed) + if (info != null) { - if (info != null) + for (Stat stat : changed) { switch (stat) { diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/Creature.java index 46471b63d7..42c530327e 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -2697,9 +2697,9 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe info = new UserInfo(getActingPlayer(), false); info.addComponentType(UserInfoType.SLOTS, UserInfoType.ENCHANTLEVEL); } - for (Stat stat : changed) + if (info != null) { - if (info != null) + for (Stat stat : changed) { switch (stat) {