Remove previous summon when summoning skill finishes casting.

This commit is contained in:
MobiusDev 2019-01-26 00:16:13 +00:00
parent d70d89bdd1
commit e58a5a4ae4
10 changed files with 10 additions and 90 deletions

View File

@ -19,7 +19,6 @@ package handlers.skillconditionhandlers;
import com.l2jmobius.gameserver.model.L2Object;
import com.l2jmobius.gameserver.model.StatsSet;
import com.l2jmobius.gameserver.model.actor.L2Character;
import com.l2jmobius.gameserver.model.actor.L2Summon;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.model.skills.ISkillCondition;
import com.l2jmobius.gameserver.model.skills.Skill;
@ -45,14 +44,7 @@ public class CanSummonSkillCondition implements ISkillCondition
boolean canSummon = true;
if (player.hasServitors())
{
for (L2Summon summon : player.getServitors().values())
{
summon.unSummon(player);
}
}
else if (player.isFlyingMounted() || player.isMounted() || player.inObserverMode() || player.isTeleporting())
if (player.isFlyingMounted() || player.isMounted() || player.inObserverMode() || player.isTeleporting())
{
canSummon = false;
}

View File

@ -19,7 +19,6 @@ package handlers.skillconditionhandlers;
import com.l2jmobius.gameserver.model.L2Object;
import com.l2jmobius.gameserver.model.StatsSet;
import com.l2jmobius.gameserver.model.actor.L2Character;
import com.l2jmobius.gameserver.model.actor.L2Summon;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.model.skills.ISkillCondition;
import com.l2jmobius.gameserver.model.skills.Skill;
@ -45,14 +44,7 @@ public class CanSummonSkillCondition implements ISkillCondition
boolean canSummon = true;
if (player.hasServitors())
{
for (L2Summon summon : player.getServitors().values())
{
summon.unSummon(player);
}
}
else if (player.isFlyingMounted() || player.isMounted() || player.inObserverMode() || player.isTeleporting())
if (player.isFlyingMounted() || player.isMounted() || player.inObserverMode() || player.isTeleporting())
{
canSummon = false;
}

View File

@ -19,7 +19,6 @@ package handlers.skillconditionhandlers;
import com.l2jmobius.gameserver.model.L2Object;
import com.l2jmobius.gameserver.model.StatsSet;
import com.l2jmobius.gameserver.model.actor.L2Character;
import com.l2jmobius.gameserver.model.actor.L2Summon;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.model.skills.ISkillCondition;
import com.l2jmobius.gameserver.model.skills.Skill;
@ -45,14 +44,7 @@ public class CanSummonSkillCondition implements ISkillCondition
boolean canSummon = true;
if (player.hasServitors())
{
for (L2Summon summon : player.getServitors().values())
{
summon.unSummon(player);
}
}
else if (player.isFlyingMounted() || player.isMounted() || player.inObserverMode() || player.isTeleporting())
if (player.isFlyingMounted() || player.isMounted() || player.inObserverMode() || player.isTeleporting())
{
canSummon = false;
}

View File

@ -19,7 +19,6 @@ package handlers.skillconditionhandlers;
import com.l2jmobius.gameserver.model.L2Object;
import com.l2jmobius.gameserver.model.StatsSet;
import com.l2jmobius.gameserver.model.actor.L2Character;
import com.l2jmobius.gameserver.model.actor.L2Summon;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.model.skills.ISkillCondition;
import com.l2jmobius.gameserver.model.skills.Skill;
@ -45,14 +44,7 @@ public class CanSummonSkillCondition implements ISkillCondition
boolean canSummon = true;
if (player.hasServitors())
{
for (L2Summon summon : player.getServitors().values())
{
summon.unSummon(player);
}
}
else if (player.isFlyingMounted() || player.isMounted() || player.inObserverMode() || player.isTeleporting())
if (player.isFlyingMounted() || player.isMounted() || player.inObserverMode() || player.isTeleporting())
{
canSummon = false;
}

View File

@ -19,7 +19,6 @@ package handlers.skillconditionhandlers;
import com.l2jmobius.gameserver.model.L2Object;
import com.l2jmobius.gameserver.model.StatsSet;
import com.l2jmobius.gameserver.model.actor.L2Character;
import com.l2jmobius.gameserver.model.actor.L2Summon;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.model.skills.ISkillCondition;
import com.l2jmobius.gameserver.model.skills.Skill;
@ -45,14 +44,7 @@ public class CanSummonSkillCondition implements ISkillCondition
boolean canSummon = true;
if (player.hasServitors())
{
for (L2Summon summon : player.getServitors().values())
{
summon.unSummon(player);
}
}
else if (player.isFlyingMounted() || player.isMounted() || player.inObserverMode() || player.isTeleporting())
if (player.isFlyingMounted() || player.isMounted() || player.inObserverMode() || player.isTeleporting())
{
canSummon = false;
}

View File

@ -19,7 +19,6 @@ package handlers.skillconditionhandlers;
import com.l2jmobius.gameserver.model.L2Object;
import com.l2jmobius.gameserver.model.StatsSet;
import com.l2jmobius.gameserver.model.actor.L2Character;
import com.l2jmobius.gameserver.model.actor.L2Summon;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.model.skills.ISkillCondition;
import com.l2jmobius.gameserver.model.skills.Skill;
@ -45,14 +44,7 @@ public class CanSummonSkillCondition implements ISkillCondition
boolean canSummon = true;
if (player.hasServitors())
{
for (L2Summon summon : player.getServitors().values())
{
summon.unSummon(player);
}
}
else if (player.isFlyingMounted() || player.isMounted() || player.inObserverMode() || player.isTeleporting())
if (player.isFlyingMounted() || player.isMounted() || player.inObserverMode() || player.isTeleporting())
{
canSummon = false;
}

View File

@ -19,7 +19,6 @@ package handlers.skillconditionhandlers;
import com.l2jmobius.gameserver.model.L2Object;
import com.l2jmobius.gameserver.model.StatsSet;
import com.l2jmobius.gameserver.model.actor.L2Character;
import com.l2jmobius.gameserver.model.actor.L2Summon;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.model.skills.ISkillCondition;
import com.l2jmobius.gameserver.model.skills.Skill;
@ -45,14 +44,7 @@ public class CanSummonSkillCondition implements ISkillCondition
boolean canSummon = true;
if (player.hasServitors())
{
for (L2Summon summon : player.getServitors().values())
{
summon.unSummon(player);
}
}
else if (player.isFlyingMounted() || player.isMounted() || player.inObserverMode() || player.isTeleporting())
if (player.isFlyingMounted() || player.isMounted() || player.inObserverMode() || player.isTeleporting())
{
canSummon = false;
}

View File

@ -19,7 +19,6 @@ package handlers.skillconditionhandlers;
import com.l2jmobius.gameserver.model.L2Object;
import com.l2jmobius.gameserver.model.StatsSet;
import com.l2jmobius.gameserver.model.actor.L2Character;
import com.l2jmobius.gameserver.model.actor.L2Summon;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.model.skills.ISkillCondition;
import com.l2jmobius.gameserver.model.skills.Skill;
@ -45,14 +44,7 @@ public class CanSummonSkillCondition implements ISkillCondition
boolean canSummon = true;
if (player.hasServitors())
{
for (L2Summon summon : player.getServitors().values())
{
summon.unSummon(player);
}
}
else if (player.isFlyingMounted() || player.isMounted() || player.inObserverMode() || player.isTeleporting())
if (player.isFlyingMounted() || player.isMounted() || player.inObserverMode() || player.isTeleporting())
{
canSummon = false;
}

View File

@ -19,7 +19,6 @@ package handlers.skillconditionhandlers;
import com.l2jmobius.gameserver.model.L2Object;
import com.l2jmobius.gameserver.model.StatsSet;
import com.l2jmobius.gameserver.model.actor.L2Character;
import com.l2jmobius.gameserver.model.actor.L2Summon;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.model.skills.ISkillCondition;
import com.l2jmobius.gameserver.model.skills.Skill;
@ -45,14 +44,7 @@ public class CanSummonSkillCondition implements ISkillCondition
boolean canSummon = true;
if (player.hasServitors())
{
for (L2Summon summon : player.getServitors().values())
{
summon.unSummon(player);
}
}
else if (player.isFlyingMounted() || player.isMounted() || player.inObserverMode() || player.isTeleporting())
if (player.isFlyingMounted() || player.isMounted() || player.inObserverMode() || player.isTeleporting())
{
canSummon = false;
}

View File

@ -19,7 +19,6 @@ package handlers.skillconditionhandlers;
import com.l2jmobius.gameserver.model.L2Object;
import com.l2jmobius.gameserver.model.StatsSet;
import com.l2jmobius.gameserver.model.actor.L2Character;
import com.l2jmobius.gameserver.model.actor.L2Summon;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.model.skills.ISkillCondition;
import com.l2jmobius.gameserver.model.skills.Skill;
@ -45,14 +44,7 @@ public class CanSummonSkillCondition implements ISkillCondition
boolean canSummon = true;
if (player.hasServitors())
{
for (L2Summon summon : player.getServitors().values())
{
summon.unSummon(player);
}
}
else if (player.isFlyingMounted() || player.isMounted() || player.inObserverMode() || player.isTeleporting())
if (player.isFlyingMounted() || player.isMounted() || player.inObserverMode() || player.isTeleporting())
{
canSummon = false;
}