diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Summon.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Summon.java index 34eb558e47..c96d8e4efb 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Summon.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Summon.java @@ -407,8 +407,13 @@ public abstract class Summon extends Playable public void unSummon(PlayerInstance owner) { - if (isSpawned() && !isDead()) + if (isSpawned()) { + if (isDead()) + { + stopDecay(); + } + // Prevent adding effects while unsummoning. setInvul(true); diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/Summon.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/Summon.java index 34eb558e47..c96d8e4efb 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/Summon.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/Summon.java @@ -407,8 +407,13 @@ public abstract class Summon extends Playable public void unSummon(PlayerInstance owner) { - if (isSpawned() && !isDead()) + if (isSpawned()) { + if (isDead()) + { + stopDecay(); + } + // Prevent adding effects while unsummoning. setInvul(true); diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/Summon.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/Summon.java index 34eb558e47..c96d8e4efb 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/Summon.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/Summon.java @@ -407,8 +407,13 @@ public abstract class Summon extends Playable public void unSummon(PlayerInstance owner) { - if (isSpawned() && !isDead()) + if (isSpawned()) { + if (isDead()) + { + stopDecay(); + } + // Prevent adding effects while unsummoning. setInvul(true); diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Summon.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Summon.java index 34eb558e47..c96d8e4efb 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Summon.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Summon.java @@ -407,8 +407,13 @@ public abstract class Summon extends Playable public void unSummon(PlayerInstance owner) { - if (isSpawned() && !isDead()) + if (isSpawned()) { + if (isDead()) + { + stopDecay(); + } + // Prevent adding effects while unsummoning. setInvul(true); diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Summon.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Summon.java index 34eb558e47..c96d8e4efb 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Summon.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Summon.java @@ -407,8 +407,13 @@ public abstract class Summon extends Playable public void unSummon(PlayerInstance owner) { - if (isSpawned() && !isDead()) + if (isSpawned()) { + if (isDead()) + { + stopDecay(); + } + // Prevent adding effects while unsummoning. setInvul(true); diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Summon.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Summon.java index 34eb558e47..c96d8e4efb 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Summon.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Summon.java @@ -407,8 +407,13 @@ public abstract class Summon extends Playable public void unSummon(PlayerInstance owner) { - if (isSpawned() && !isDead()) + if (isSpawned()) { + if (isDead()) + { + stopDecay(); + } + // Prevent adding effects while unsummoning. setInvul(true); diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Summon.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Summon.java index 34eb558e47..c96d8e4efb 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Summon.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Summon.java @@ -407,8 +407,13 @@ public abstract class Summon extends Playable public void unSummon(PlayerInstance owner) { - if (isSpawned() && !isDead()) + if (isSpawned()) { + if (isDead()) + { + stopDecay(); + } + // Prevent adding effects while unsummoning. setInvul(true); diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Summon.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Summon.java index 0ddc8a4f78..66bacd1d9a 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Summon.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Summon.java @@ -407,8 +407,13 @@ public abstract class Summon extends Playable public void unSummon(PlayerInstance owner) { - if (isSpawned() && !isDead()) + if (isSpawned()) { + if (isDead()) + { + stopDecay(); + } + // Prevent adding effects while unsummoning. setInvul(true); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Summon.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Summon.java index 4ad20cafbf..ca5f624f7f 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Summon.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Summon.java @@ -407,8 +407,13 @@ public abstract class Summon extends Playable public void unSummon(PlayerInstance owner) { - if (isSpawned() && !isDead()) + if (isSpawned()) { + if (isDead()) + { + stopDecay(); + } + // Prevent adding effects while unsummoning. setInvul(true); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Summon.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Summon.java index 4ad20cafbf..ca5f624f7f 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Summon.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Summon.java @@ -407,8 +407,13 @@ public abstract class Summon extends Playable public void unSummon(PlayerInstance owner) { - if (isSpawned() && !isDead()) + if (isSpawned()) { + if (isDead()) + { + stopDecay(); + } + // Prevent adding effects while unsummoning. setInvul(true); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Summon.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Summon.java index 4ad20cafbf..ca5f624f7f 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Summon.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Summon.java @@ -407,8 +407,13 @@ public abstract class Summon extends Playable public void unSummon(PlayerInstance owner) { - if (isSpawned() && !isDead()) + if (isSpawned()) { + if (isDead()) + { + stopDecay(); + } + // Prevent adding effects while unsummoning. setInvul(true); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Summon.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Summon.java index 46c221036a..49b9a89975 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Summon.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Summon.java @@ -407,8 +407,13 @@ public abstract class Summon extends Playable public void unSummon(PlayerInstance owner) { - if (isSpawned() && !isDead()) + if (isSpawned()) { + if (isDead()) + { + stopDecay(); + } + // Prevent adding effects while unsummoning. setInvul(true); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Summon.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Summon.java index 46c221036a..49b9a89975 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Summon.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Summon.java @@ -407,8 +407,13 @@ public abstract class Summon extends Playable public void unSummon(PlayerInstance owner) { - if (isSpawned() && !isDead()) + if (isSpawned()) { + if (isDead()) + { + stopDecay(); + } + // Prevent adding effects while unsummoning. setInvul(true); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Summon.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Summon.java index 1c463a1d13..ba928d6cb6 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Summon.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Summon.java @@ -407,8 +407,13 @@ public abstract class Summon extends Playable public void unSummon(PlayerInstance owner) { - if (isSpawned() && !isDead()) + if (isSpawned()) { + if (isDead()) + { + stopDecay(); + } + // Prevent adding effects while unsummoning. setInvul(true); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Summon.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Summon.java index 4ad20cafbf..ca5f624f7f 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Summon.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Summon.java @@ -407,8 +407,13 @@ public abstract class Summon extends Playable public void unSummon(PlayerInstance owner) { - if (isSpawned() && !isDead()) + if (isSpawned()) { + if (isDead()) + { + stopDecay(); + } + // Prevent adding effects while unsummoning. setInvul(true);