lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Keep character transformation after dismount.

Browse Source
This commit is contained in:
MobiusDevelopment
2022-01-08 23:29:56 +00:00
parent 04d169c34e
commit 6164cd0a16
42 changed files with 105 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files
L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Creature.java
+1 -2
View File
@@ -2538,9 +2538,8 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
*/ */
public void stopTransformation(boolean removeEffects) public void stopTransformation(boolean removeEffects)
{ {
if (removeEffects) if (removeEffects && !_effectList.stopEffects(AbnormalType.TRANSFORM))
{ {
_effectList.stopEffects(AbnormalType.TRANSFORM);
_effectList.stopEffects(AbnormalType.CHANGEBODY); _effectList.stopEffects(AbnormalType.CHANGEBODY);
} }
L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java
+3 -1
View File
@@ -383,8 +383,10 @@ public class Transform implements IIdentifiable
player.sendPacket(ExBasicActionList.STATIC_PACKET); player.sendPacket(ExBasicActionList.STATIC_PACKET);
player.getEffectList().stopEffects(AbnormalType.TRANSFORM); if (!player.getEffectList().stopEffects(AbnormalType.TRANSFORM))
{
player.getEffectList().stopEffects(AbnormalType.CHANGEBODY); player.getEffectList().stopEffects(AbnormalType.CHANGEBODY);
}
if (hasTransformSkills) if (hasTransformSkills)
{ {
L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/Creature.java
+1 -2
View File
@@ -2538,9 +2538,8 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
*/ */
public void stopTransformation(boolean removeEffects) public void stopTransformation(boolean removeEffects)
{ {
if (removeEffects) if (removeEffects && !_effectList.stopEffects(AbnormalType.TRANSFORM))
{ {
_effectList.stopEffects(AbnormalType.TRANSFORM);
_effectList.stopEffects(AbnormalType.CHANGEBODY); _effectList.stopEffects(AbnormalType.CHANGEBODY);
} }
L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java
+3 -1
View File
@@ -383,8 +383,10 @@ public class Transform implements IIdentifiable
player.sendPacket(ExBasicActionList.STATIC_PACKET); player.sendPacket(ExBasicActionList.STATIC_PACKET);
player.getEffectList().stopEffects(AbnormalType.TRANSFORM); if (!player.getEffectList().stopEffects(AbnormalType.TRANSFORM))
{
player.getEffectList().stopEffects(AbnormalType.CHANGEBODY); player.getEffectList().stopEffects(AbnormalType.CHANGEBODY);
}
if (hasTransformSkills) if (hasTransformSkills)
{ {
L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/Creature.java
+1 -2
View File
@@ -2538,9 +2538,8 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
*/ */
public void stopTransformation(boolean removeEffects) public void stopTransformation(boolean removeEffects)
{ {
if (removeEffects) if (removeEffects && !_effectList.stopEffects(AbnormalType.TRANSFORM))
{ {
_effectList.stopEffects(AbnormalType.TRANSFORM);
_effectList.stopEffects(AbnormalType.CHANGEBODY); _effectList.stopEffects(AbnormalType.CHANGEBODY);
} }
L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java
+3 -1
View File
@@ -383,8 +383,10 @@ public class Transform implements IIdentifiable
player.sendPacket(ExBasicActionList.STATIC_PACKET); player.sendPacket(ExBasicActionList.STATIC_PACKET);
player.getEffectList().stopEffects(AbnormalType.TRANSFORM); if (!player.getEffectList().stopEffects(AbnormalType.TRANSFORM))
{
player.getEffectList().stopEffects(AbnormalType.CHANGEBODY); player.getEffectList().stopEffects(AbnormalType.CHANGEBODY);
}
if (hasTransformSkills) if (hasTransformSkills)
{ {
L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Creature.java
+1 -2
View File
@@ -2538,9 +2538,8 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
*/ */
public void stopTransformation(boolean removeEffects) public void stopTransformation(boolean removeEffects)
{ {
if (removeEffects) if (removeEffects && !_effectList.stopEffects(AbnormalType.TRANSFORM))
{ {
_effectList.stopEffects(AbnormalType.TRANSFORM);
_effectList.stopEffects(AbnormalType.CHANGEBODY); _effectList.stopEffects(AbnormalType.CHANGEBODY);
} }
L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java
+3 -1
View File
@@ -383,8 +383,10 @@ public class Transform implements IIdentifiable
player.sendPacket(ExBasicActionList.STATIC_PACKET); player.sendPacket(ExBasicActionList.STATIC_PACKET);
player.getEffectList().stopEffects(AbnormalType.TRANSFORM); if (!player.getEffectList().stopEffects(AbnormalType.TRANSFORM))
{
player.getEffectList().stopEffects(AbnormalType.CHANGEBODY); player.getEffectList().stopEffects(AbnormalType.CHANGEBODY);
}
if (hasTransformSkills) if (hasTransformSkills)
{ {
L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Creature.java
+1 -2
View File
@@ -2538,9 +2538,8 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
*/ */
public void stopTransformation(boolean removeEffects) public void stopTransformation(boolean removeEffects)
{ {
if (removeEffects) if (removeEffects && !_effectList.stopEffects(AbnormalType.TRANSFORM))
{ {
_effectList.stopEffects(AbnormalType.TRANSFORM);
_effectList.stopEffects(AbnormalType.CHANGEBODY); _effectList.stopEffects(AbnormalType.CHANGEBODY);
} }
L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java
+3 -1
View File
@@ -383,8 +383,10 @@ public class Transform implements IIdentifiable
player.sendPacket(ExBasicActionList.STATIC_PACKET); player.sendPacket(ExBasicActionList.STATIC_PACKET);
player.getEffectList().stopEffects(AbnormalType.TRANSFORM); if (!player.getEffectList().stopEffects(AbnormalType.TRANSFORM))
{
player.getEffectList().stopEffects(AbnormalType.CHANGEBODY); player.getEffectList().stopEffects(AbnormalType.CHANGEBODY);
}
if (hasTransformSkills) if (hasTransformSkills)
{ {
L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Creature.java
+1 -2
View File
@@ -2538,9 +2538,8 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
*/ */
public void stopTransformation(boolean removeEffects) public void stopTransformation(boolean removeEffects)
{ {
if (removeEffects) if (removeEffects && !_effectList.stopEffects(AbnormalType.TRANSFORM))
{ {
_effectList.stopEffects(AbnormalType.TRANSFORM);
_effectList.stopEffects(AbnormalType.CHANGEBODY); _effectList.stopEffects(AbnormalType.CHANGEBODY);
} }
L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java
+3 -1
View File
@@ -383,8 +383,10 @@ public class Transform implements IIdentifiable
player.sendPacket(ExBasicActionList.STATIC_PACKET); player.sendPacket(ExBasicActionList.STATIC_PACKET);
player.getEffectList().stopEffects(AbnormalType.TRANSFORM); if (!player.getEffectList().stopEffects(AbnormalType.TRANSFORM))
{
player.getEffectList().stopEffects(AbnormalType.CHANGEBODY); player.getEffectList().stopEffects(AbnormalType.CHANGEBODY);
}
if (hasTransformSkills) if (hasTransformSkills)
{ {
L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Creature.java
+1 -2
View File
@@ -2538,9 +2538,8 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
*/ */
public void stopTransformation(boolean removeEffects) public void stopTransformation(boolean removeEffects)
{ {
if (removeEffects) if (removeEffects && !_effectList.stopEffects(AbnormalType.TRANSFORM))
{ {
_effectList.stopEffects(AbnormalType.TRANSFORM);
_effectList.stopEffects(AbnormalType.CHANGEBODY); _effectList.stopEffects(AbnormalType.CHANGEBODY);
} }
L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java
+3 -1
View File
@@ -383,8 +383,10 @@ public class Transform implements IIdentifiable
player.sendPacket(ExBasicActionList.STATIC_PACKET); player.sendPacket(ExBasicActionList.STATIC_PACKET);
player.getEffectList().stopEffects(AbnormalType.TRANSFORM); if (!player.getEffectList().stopEffects(AbnormalType.TRANSFORM))
{
player.getEffectList().stopEffects(AbnormalType.CHANGEBODY); player.getEffectList().stopEffects(AbnormalType.CHANGEBODY);
}
if (hasTransformSkills) if (hasTransformSkills)
{ {
L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Creature.java
+1 -2
View File
@@ -2538,9 +2538,8 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
*/ */
public void stopTransformation(boolean removeEffects) public void stopTransformation(boolean removeEffects)
{ {
if (removeEffects) if (removeEffects && !_effectList.stopEffects(AbnormalType.TRANSFORM))
{ {
_effectList.stopEffects(AbnormalType.TRANSFORM);
_effectList.stopEffects(AbnormalType.CHANGEBODY); _effectList.stopEffects(AbnormalType.CHANGEBODY);
} }
L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java
+3 -1
View File
@@ -383,8 +383,10 @@ public class Transform implements IIdentifiable
player.sendPacket(ExBasicActionList.STATIC_PACKET); player.sendPacket(ExBasicActionList.STATIC_PACKET);
player.getEffectList().stopEffects(AbnormalType.TRANSFORM); if (!player.getEffectList().stopEffects(AbnormalType.TRANSFORM))
{
player.getEffectList().stopEffects(AbnormalType.CHANGEBODY); player.getEffectList().stopEffects(AbnormalType.CHANGEBODY);
}
if (hasTransformSkills) if (hasTransformSkills)
{ {
L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/Creature.java
+1 -2
View File
@@ -2538,9 +2538,8 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
*/ */
public void stopTransformation(boolean removeEffects) public void stopTransformation(boolean removeEffects)
{ {
if (removeEffects) if (removeEffects && !_effectList.stopEffects(AbnormalType.TRANSFORM))
{ {
_effectList.stopEffects(AbnormalType.TRANSFORM);
_effectList.stopEffects(AbnormalType.CHANGEBODY); _effectList.stopEffects(AbnormalType.CHANGEBODY);
} }
L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java
+3 -1
View File
@@ -383,8 +383,10 @@ public class Transform implements IIdentifiable
player.sendPacket(ExBasicActionList.STATIC_PACKET); player.sendPacket(ExBasicActionList.STATIC_PACKET);
player.getEffectList().stopEffects(AbnormalType.TRANSFORM); if (!player.getEffectList().stopEffects(AbnormalType.TRANSFORM))
{
player.getEffectList().stopEffects(AbnormalType.CHANGEBODY); player.getEffectList().stopEffects(AbnormalType.CHANGEBODY);
}
if (hasTransformSkills) if (hasTransformSkills)
{ {
L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Creature.java
+1 -2
View File
@@ -2538,9 +2538,8 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
*/ */
public void stopTransformation(boolean removeEffects) public void stopTransformation(boolean removeEffects)
{ {
if (removeEffects) if (removeEffects && !_effectList.stopEffects(AbnormalType.TRANSFORM))
{ {
_effectList.stopEffects(AbnormalType.TRANSFORM);
_effectList.stopEffects(AbnormalType.CHANGEBODY); _effectList.stopEffects(AbnormalType.CHANGEBODY);
} }
L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java
+3 -1
View File
@@ -383,8 +383,10 @@ public class Transform implements IIdentifiable
player.sendPacket(ExBasicActionList.STATIC_PACKET); player.sendPacket(ExBasicActionList.STATIC_PACKET);
player.getEffectList().stopEffects(AbnormalType.TRANSFORM); if (!player.getEffectList().stopEffects(AbnormalType.TRANSFORM))
{
player.getEffectList().stopEffects(AbnormalType.CHANGEBODY); player.getEffectList().stopEffects(AbnormalType.CHANGEBODY);
}
if (hasTransformSkills) if (hasTransformSkills)
{ {
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/Creature.java
+1 -2
View File
@@ -2538,9 +2538,8 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
*/ */
public void stopTransformation(boolean removeEffects) public void stopTransformation(boolean removeEffects)
{ {
if (removeEffects) if (removeEffects && !_effectList.stopEffects(AbnormalType.TRANSFORM))
{ {
_effectList.stopEffects(AbnormalType.TRANSFORM);
_effectList.stopEffects(AbnormalType.CHANGEBODY); _effectList.stopEffects(AbnormalType.CHANGEBODY);
} }
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java
+3 -1
View File
@@ -383,8 +383,10 @@ public class Transform implements IIdentifiable
player.sendPacket(ExBasicActionList.STATIC_PACKET); player.sendPacket(ExBasicActionList.STATIC_PACKET);
player.getEffectList().stopEffects(AbnormalType.TRANSFORM); if (!player.getEffectList().stopEffects(AbnormalType.TRANSFORM))
{
player.getEffectList().stopEffects(AbnormalType.CHANGEBODY); player.getEffectList().stopEffects(AbnormalType.CHANGEBODY);
}
if (hasTransformSkills) if (hasTransformSkills)
{ {
L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Creature.java
+1 -2
View File
@@ -2538,9 +2538,8 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
*/ */
public void stopTransformation(boolean removeEffects) public void stopTransformation(boolean removeEffects)
{ {
if (removeEffects) if (removeEffects && !_effectList.stopEffects(AbnormalType.TRANSFORM))
{ {
_effectList.stopEffects(AbnormalType.TRANSFORM);
_effectList.stopEffects(AbnormalType.CHANGEBODY); _effectList.stopEffects(AbnormalType.CHANGEBODY);
} }
L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java
+3 -1
View File
@@ -383,8 +383,10 @@ public class Transform implements IIdentifiable
player.sendPacket(ExBasicActionList.STATIC_PACKET); player.sendPacket(ExBasicActionList.STATIC_PACKET);
player.getEffectList().stopEffects(AbnormalType.TRANSFORM); if (!player.getEffectList().stopEffects(AbnormalType.TRANSFORM))
{
player.getEffectList().stopEffects(AbnormalType.CHANGEBODY); player.getEffectList().stopEffects(AbnormalType.CHANGEBODY);
}
if (hasTransformSkills) if (hasTransformSkills)
{ {
L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Creature.java
+1 -2
View File
@@ -2538,9 +2538,8 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
*/ */
public void stopTransformation(boolean removeEffects) public void stopTransformation(boolean removeEffects)
{ {
if (removeEffects) if (removeEffects && !_effectList.stopEffects(AbnormalType.TRANSFORM))
{ {
_effectList.stopEffects(AbnormalType.TRANSFORM);
_effectList.stopEffects(AbnormalType.CHANGEBODY); _effectList.stopEffects(AbnormalType.CHANGEBODY);
} }
L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java
+3 -1
View File
@@ -383,8 +383,10 @@ public class Transform implements IIdentifiable
player.sendPacket(ExBasicActionList.STATIC_PACKET); player.sendPacket(ExBasicActionList.STATIC_PACKET);
player.getEffectList().stopEffects(AbnormalType.TRANSFORM); if (!player.getEffectList().stopEffects(AbnormalType.TRANSFORM))
{
player.getEffectList().stopEffects(AbnormalType.CHANGEBODY); player.getEffectList().stopEffects(AbnormalType.CHANGEBODY);
}
if (hasTransformSkills) if (hasTransformSkills)
{ {
L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Creature.java
+1 -2
View File
@@ -2538,9 +2538,8 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
*/ */
public void stopTransformation(boolean removeEffects) public void stopTransformation(boolean removeEffects)
{ {
if (removeEffects) if (removeEffects && !_effectList.stopEffects(AbnormalType.TRANSFORM))
{ {
_effectList.stopEffects(AbnormalType.TRANSFORM);
_effectList.stopEffects(AbnormalType.CHANGEBODY); _effectList.stopEffects(AbnormalType.CHANGEBODY);
} }
L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java
+3 -1
View File
@@ -383,8 +383,10 @@ public class Transform implements IIdentifiable
player.sendPacket(ExBasicActionList.STATIC_PACKET); player.sendPacket(ExBasicActionList.STATIC_PACKET);
player.getEffectList().stopEffects(AbnormalType.TRANSFORM); if (!player.getEffectList().stopEffects(AbnormalType.TRANSFORM))
{
player.getEffectList().stopEffects(AbnormalType.CHANGEBODY); player.getEffectList().stopEffects(AbnormalType.CHANGEBODY);
}
if (hasTransformSkills) if (hasTransformSkills)
{ {
L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Creature.java
+1 -2
View File
@@ -2539,9 +2539,8 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
*/ */
public void stopTransformation(boolean removeEffects) public void stopTransformation(boolean removeEffects)
{ {
if (removeEffects) if (removeEffects && !_effectList.stopEffects(AbnormalType.TRANSFORM))
{ {
_effectList.stopEffects(AbnormalType.TRANSFORM);
_effectList.stopEffects(AbnormalType.CHANGEBODY); _effectList.stopEffects(AbnormalType.CHANGEBODY);
} }
L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java
+3 -1
View File
@@ -383,8 +383,10 @@ public class Transform implements IIdentifiable
player.sendPacket(ExBasicActionList.STATIC_PACKET); player.sendPacket(ExBasicActionList.STATIC_PACKET);
player.getEffectList().stopEffects(AbnormalType.TRANSFORM); if (!player.getEffectList().stopEffects(AbnormalType.TRANSFORM))
{
player.getEffectList().stopEffects(AbnormalType.CHANGEBODY); player.getEffectList().stopEffects(AbnormalType.CHANGEBODY);
}
if (hasTransformSkills) if (hasTransformSkills)
{ {
L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Creature.java
+1 -2
View File
@@ -2539,9 +2539,8 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
*/ */
public void stopTransformation(boolean removeEffects) public void stopTransformation(boolean removeEffects)
{ {
if (removeEffects) if (removeEffects && !_effectList.stopEffects(AbnormalType.TRANSFORM))
{ {
_effectList.stopEffects(AbnormalType.TRANSFORM);
_effectList.stopEffects(AbnormalType.CHANGEBODY); _effectList.stopEffects(AbnormalType.CHANGEBODY);
} }
L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java
+3 -1
View File
@@ -383,8 +383,10 @@ public class Transform implements IIdentifiable
player.sendPacket(ExBasicActionList.STATIC_PACKET); player.sendPacket(ExBasicActionList.STATIC_PACKET);
player.getEffectList().stopEffects(AbnormalType.TRANSFORM); if (!player.getEffectList().stopEffects(AbnormalType.TRANSFORM))
{
player.getEffectList().stopEffects(AbnormalType.CHANGEBODY); player.getEffectList().stopEffects(AbnormalType.CHANGEBODY);
}
if (hasTransformSkills) if (hasTransformSkills)
{ {
L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Creature.java
+1 -2
View File
@@ -2539,9 +2539,8 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
*/ */
public void stopTransformation(boolean removeEffects) public void stopTransformation(boolean removeEffects)
{ {
if (removeEffects) if (removeEffects && !_effectList.stopEffects(AbnormalType.TRANSFORM))
{ {
_effectList.stopEffects(AbnormalType.TRANSFORM);
_effectList.stopEffects(AbnormalType.CHANGEBODY); _effectList.stopEffects(AbnormalType.CHANGEBODY);
} }
L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java
+3 -1
View File
@@ -383,8 +383,10 @@ public class Transform implements IIdentifiable
player.sendPacket(ExBasicActionList.STATIC_PACKET); player.sendPacket(ExBasicActionList.STATIC_PACKET);
player.getEffectList().stopEffects(AbnormalType.TRANSFORM); if (!player.getEffectList().stopEffects(AbnormalType.TRANSFORM))
{
player.getEffectList().stopEffects(AbnormalType.CHANGEBODY); player.getEffectList().stopEffects(AbnormalType.CHANGEBODY);
}
if (hasTransformSkills) if (hasTransformSkills)
{ {
L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Creature.java
+1 -2
View File
@@ -2538,9 +2538,8 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
*/ */
public void stopTransformation(boolean removeEffects) public void stopTransformation(boolean removeEffects)
{ {
if (removeEffects) if (removeEffects && !_effectList.stopEffects(AbnormalType.TRANSFORM))
{ {
_effectList.stopEffects(AbnormalType.TRANSFORM);
_effectList.stopEffects(AbnormalType.CHANGEBODY); _effectList.stopEffects(AbnormalType.CHANGEBODY);
} }
L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java
+3 -1
View File
@@ -383,8 +383,10 @@ public class Transform implements IIdentifiable
player.sendPacket(ExBasicActionList.STATIC_PACKET); player.sendPacket(ExBasicActionList.STATIC_PACKET);
player.getEffectList().stopEffects(AbnormalType.TRANSFORM); if (!player.getEffectList().stopEffects(AbnormalType.TRANSFORM))
{
player.getEffectList().stopEffects(AbnormalType.CHANGEBODY); player.getEffectList().stopEffects(AbnormalType.CHANGEBODY);
}
if (hasTransformSkills) if (hasTransformSkills)
{ {
L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Creature.java
+1 -2
View File
@@ -2542,9 +2542,8 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
*/ */
public void stopTransformation(boolean removeEffects) public void stopTransformation(boolean removeEffects)
{ {
if (removeEffects) if (removeEffects && !_effectList.stopEffects(AbnormalType.TRANSFORM))
{ {
_effectList.stopEffects(AbnormalType.TRANSFORM);
_effectList.stopEffects(AbnormalType.CHANGEBODY); _effectList.stopEffects(AbnormalType.CHANGEBODY);
} }
L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java
+3 -1
View File
@@ -383,8 +383,10 @@ public class Transform implements IIdentifiable
player.sendPacket(ExBasicActionList.STATIC_PACKET); player.sendPacket(ExBasicActionList.STATIC_PACKET);
player.getEffectList().stopEffects(AbnormalType.TRANSFORM); if (!player.getEffectList().stopEffects(AbnormalType.TRANSFORM))
{
player.getEffectList().stopEffects(AbnormalType.CHANGEBODY); player.getEffectList().stopEffects(AbnormalType.CHANGEBODY);
}
if (hasTransformSkills) if (hasTransformSkills)
{ {
L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/Creature.java
+1 -2
View File
@@ -2549,9 +2549,8 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
*/ */
public void stopTransformation(boolean removeEffects) public void stopTransformation(boolean removeEffects)
{ {
if (removeEffects) if (removeEffects && !_effectList.stopEffects(AbnormalType.TRANSFORM))
{ {
_effectList.stopEffects(AbnormalType.TRANSFORM);
_effectList.stopEffects(AbnormalType.CHANGEBODY); _effectList.stopEffects(AbnormalType.CHANGEBODY);
} }
L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java
+3 -1
View File
@@ -383,8 +383,10 @@ public class Transform implements IIdentifiable
player.sendPacket(ExBasicActionList.STATIC_PACKET); player.sendPacket(ExBasicActionList.STATIC_PACKET);
player.getEffectList().stopEffects(AbnormalType.TRANSFORM); if (!player.getEffectList().stopEffects(AbnormalType.TRANSFORM))
{
player.getEffectList().stopEffects(AbnormalType.CHANGEBODY); player.getEffectList().stopEffects(AbnormalType.CHANGEBODY);
}
if (hasTransformSkills) if (hasTransformSkills)
{ {
L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/Creature.java
+1 -2
View File
@@ -2549,9 +2549,8 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
*/ */
public void stopTransformation(boolean removeEffects) public void stopTransformation(boolean removeEffects)
{ {
if (removeEffects) if (removeEffects && !_effectList.stopEffects(AbnormalType.TRANSFORM))
{ {
_effectList.stopEffects(AbnormalType.TRANSFORM);
_effectList.stopEffects(AbnormalType.CHANGEBODY); _effectList.stopEffects(AbnormalType.CHANGEBODY);
} }
L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java
+3 -1
View File
@@ -383,8 +383,10 @@ public class Transform implements IIdentifiable
player.sendPacket(ExBasicActionList.STATIC_PACKET); player.sendPacket(ExBasicActionList.STATIC_PACKET);
player.getEffectList().stopEffects(AbnormalType.TRANSFORM); if (!player.getEffectList().stopEffects(AbnormalType.TRANSFORM))
{
player.getEffectList().stopEffects(AbnormalType.CHANGEBODY); player.getEffectList().stopEffects(AbnormalType.CHANGEBODY);
}
if (hasTransformSkills) if (hasTransformSkills)
{ {