From 7797e90921b81f1e000a3fde8d85b271fe122875 Mon Sep 17 00:00:00 2001 From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com> Date: Wed, 8 Nov 2017 00:56:38 +0000 Subject: [PATCH] Fixed FortressFlagpole target handler. --- .../targethandlers/FortressFlagpole.java | 31 ++----------------- .../targethandlers/FortressFlagpole.java | 31 ++----------------- .../targethandlers/FortressFlagpole.java | 31 ++----------------- .../targethandlers/FortressFlagpole.java | 31 ++----------------- 4 files changed, 12 insertions(+), 112 deletions(-) diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/targethandlers/FortressFlagpole.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/targethandlers/FortressFlagpole.java index cfa79b1bd1..8b2c75e98e 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/targethandlers/FortressFlagpole.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/targethandlers/FortressFlagpole.java @@ -21,6 +21,7 @@ import com.l2jmobius.gameserver.model.L2Object; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.skills.targets.TargetType; +import com.l2jmobius.gameserver.model.zone.ZoneId; import com.l2jmobius.gameserver.network.SystemMessageId; /** @@ -39,35 +40,9 @@ public class FortressFlagpole implements ITargetTypeHandler public L2Object getTarget(L2Character activeChar, L2Object selectedTarget, Skill skill, boolean forceUse, boolean dontMove, boolean sendMessage) { final L2Object target = activeChar.getTarget(); - if (target != null) + if ((target != null) && activeChar.isInsideZone(ZoneId.HQ) && activeChar.isInsideZone(ZoneId.FORT) && !target.isPlayable() && target.getName().toLowerCase().contains("flagpole")) { - switch (target.getId()) - { - case 35657: - case 35688: - case 35726: - case 35757: - case 35795: - case 35826: - case 35857: - case 35895: - case 35926: - case 35964: - case 35002: - case 36033: - case 36071: - case 36109: - case 36140: - case 36171: - case 36209: - case 36247: - case 36285: - case 36316: - case 36354: - { - return target; - } - } + return target; } if (sendMessage) diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/targethandlers/FortressFlagpole.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/targethandlers/FortressFlagpole.java index cfa79b1bd1..8b2c75e98e 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/targethandlers/FortressFlagpole.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/targethandlers/FortressFlagpole.java @@ -21,6 +21,7 @@ import com.l2jmobius.gameserver.model.L2Object; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.skills.targets.TargetType; +import com.l2jmobius.gameserver.model.zone.ZoneId; import com.l2jmobius.gameserver.network.SystemMessageId; /** @@ -39,35 +40,9 @@ public class FortressFlagpole implements ITargetTypeHandler public L2Object getTarget(L2Character activeChar, L2Object selectedTarget, Skill skill, boolean forceUse, boolean dontMove, boolean sendMessage) { final L2Object target = activeChar.getTarget(); - if (target != null) + if ((target != null) && activeChar.isInsideZone(ZoneId.HQ) && activeChar.isInsideZone(ZoneId.FORT) && !target.isPlayable() && target.getName().toLowerCase().contains("flagpole")) { - switch (target.getId()) - { - case 35657: - case 35688: - case 35726: - case 35757: - case 35795: - case 35826: - case 35857: - case 35895: - case 35926: - case 35964: - case 35002: - case 36033: - case 36071: - case 36109: - case 36140: - case 36171: - case 36209: - case 36247: - case 36285: - case 36316: - case 36354: - { - return target; - } - } + return target; } if (sendMessage) diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/targethandlers/FortressFlagpole.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/targethandlers/FortressFlagpole.java index cfa79b1bd1..8b2c75e98e 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/targethandlers/FortressFlagpole.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/targethandlers/FortressFlagpole.java @@ -21,6 +21,7 @@ import com.l2jmobius.gameserver.model.L2Object; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.skills.targets.TargetType; +import com.l2jmobius.gameserver.model.zone.ZoneId; import com.l2jmobius.gameserver.network.SystemMessageId; /** @@ -39,35 +40,9 @@ public class FortressFlagpole implements ITargetTypeHandler public L2Object getTarget(L2Character activeChar, L2Object selectedTarget, Skill skill, boolean forceUse, boolean dontMove, boolean sendMessage) { final L2Object target = activeChar.getTarget(); - if (target != null) + if ((target != null) && activeChar.isInsideZone(ZoneId.HQ) && activeChar.isInsideZone(ZoneId.FORT) && !target.isPlayable() && target.getName().toLowerCase().contains("flagpole")) { - switch (target.getId()) - { - case 35657: - case 35688: - case 35726: - case 35757: - case 35795: - case 35826: - case 35857: - case 35895: - case 35926: - case 35964: - case 35002: - case 36033: - case 36071: - case 36109: - case 36140: - case 36171: - case 36209: - case 36247: - case 36285: - case 36316: - case 36354: - { - return target; - } - } + return target; } if (sendMessage) diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/targethandlers/FortressFlagpole.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/targethandlers/FortressFlagpole.java index cfa79b1bd1..8b2c75e98e 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/targethandlers/FortressFlagpole.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/targethandlers/FortressFlagpole.java @@ -21,6 +21,7 @@ import com.l2jmobius.gameserver.model.L2Object; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.skills.targets.TargetType; +import com.l2jmobius.gameserver.model.zone.ZoneId; import com.l2jmobius.gameserver.network.SystemMessageId; /** @@ -39,35 +40,9 @@ public class FortressFlagpole implements ITargetTypeHandler public L2Object getTarget(L2Character activeChar, L2Object selectedTarget, Skill skill, boolean forceUse, boolean dontMove, boolean sendMessage) { final L2Object target = activeChar.getTarget(); - if (target != null) + if ((target != null) && activeChar.isInsideZone(ZoneId.HQ) && activeChar.isInsideZone(ZoneId.FORT) && !target.isPlayable() && target.getName().toLowerCase().contains("flagpole")) { - switch (target.getId()) - { - case 35657: - case 35688: - case 35726: - case 35757: - case 35795: - case 35826: - case 35857: - case 35895: - case 35926: - case 35964: - case 35002: - case 36033: - case 36071: - case 36109: - case 36140: - case 36171: - case 36209: - case 36247: - case 36285: - case 36316: - case 36354: - { - return target; - } - } + return target; } if (sendMessage)