diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Player.java index e6235e6817..de0afa26f1 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -11388,6 +11388,11 @@ public class Player extends Playable */ public void increaseSouls(int count, SoulType type) { + if (isTransformed() || hasAbnormalType(AbnormalType.KAMAEL_TRANSFORM)) + { + return; + } + final int newCount = getChargedSouls(type) + count; _souls.put(type, newCount); final SystemMessage sm = new SystemMessage(SystemMessageId.YOUR_SOUL_COUNT_HAS_INCREASED_BY_S1_IT_IS_NOW_AT_S2); @@ -11397,7 +11402,7 @@ public class Player extends Playable restartSoulTask(); sendPacket(new EtcStatusUpdate(this)); - if ((getRace() == Race.KAMAEL) && (newCount >= 100) && !isTransformed()) + if ((getRace() == Race.KAMAEL) && (newCount >= 100)) { if (type == SoulType.LIGHT) { diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Player.java index 915b3f0922..fbb9ddf720 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -11580,6 +11580,11 @@ public class Player extends Playable */ public void increaseSouls(int count, SoulType type) { + if (isTransformed() || hasAbnormalType(AbnormalType.KAMAEL_TRANSFORM)) + { + return; + } + final int newCount = getChargedSouls(type) + count; _souls.put(type, newCount); final SystemMessage sm = new SystemMessage(SystemMessageId.YOUR_SOUL_COUNT_HAS_INCREASED_BY_S1_IT_IS_NOW_AT_S2); @@ -11589,7 +11594,7 @@ public class Player extends Playable restartSoulTask(); sendPacket(new EtcStatusUpdate(this)); - if ((getRace() == Race.KAMAEL) && (newCount >= 100) && !isTransformed()) + if ((getRace() == Race.KAMAEL) && (newCount >= 100)) { if (type == SoulType.LIGHT) { 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 2fd10fc4d4..ddaac005c8 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 @@ -11636,6 +11636,11 @@ public class Player extends Playable */ public void increaseSouls(int count, SoulType type) { + if (isTransformed() || hasAbnormalType(AbnormalType.KAMAEL_TRANSFORM)) + { + return; + } + final int newCount = getChargedSouls(type) + count; _souls.put(type, newCount); final SystemMessage sm = new SystemMessage(SystemMessageId.YOUR_SOUL_COUNT_HAS_INCREASED_BY_S1_IT_IS_NOW_AT_S2); @@ -11645,7 +11650,7 @@ public class Player extends Playable restartSoulTask(); sendPacket(new EtcStatusUpdate(this)); - if ((getRace() == Race.KAMAEL) && (newCount >= 100) && !isTransformed()) + if ((getRace() == Race.KAMAEL) && (newCount >= 100)) { if (type == SoulType.LIGHT) { 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 26f0a42e0a..5794ebebf5 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 @@ -11857,6 +11857,11 @@ public class Player extends Playable */ public void increaseSouls(int count, SoulType type) { + if (isTransformed() || hasAbnormalType(AbnormalType.KAMAEL_TRANSFORM)) + { + return; + } + final int newCount = getChargedSouls(type) + count; _souls.put(type, newCount); final SystemMessage sm = new SystemMessage(SystemMessageId.YOUR_SOUL_COUNT_HAS_INCREASED_BY_S1_IT_IS_NOW_AT_S2); @@ -11866,7 +11871,7 @@ public class Player extends Playable restartSoulTask(); sendPacket(new EtcStatusUpdate(this)); - if ((getRace() == Race.KAMAEL) && (newCount >= 100) && !isTransformed()) + if ((getRace() == Race.KAMAEL) && (newCount >= 100)) { if (type == SoulType.LIGHT) {