diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java index d3a42f7b92..d449b6aaf3 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java @@ -1102,7 +1102,7 @@ public class CeremonyOfChaos extends AbstractNpcAI sm = SystemMessageId.YOU_CANNOT_PARTICIPATE_IN_THE_CEREMONY_OF_CHAOS_WHILE_FISHING; canRegister = false; } - else if (player.isInTimedHuntingZone(player.getX(), player.getY())) + else if (player.isInTimedHuntingZone()) { sm = SystemMessageId.CANNOT_USE_TIME_LIMITED_HUNTING_ZONES_WHILE_WAITING_FOR_THE_CEREMONY_OF_CHAOS; canRegister = false; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Player.java index 80fa3b79f0..e30cf253d3 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -10591,7 +10591,7 @@ public class Player extends Playable } // Close time limited zone window. - if (!isInsideZone(ZoneId.TIMED_HUNTING)) + if (!isInTimedHuntingZone()) { stopTimedHuntingZoneTask(); } @@ -11053,7 +11053,7 @@ public class Player extends Playable } // Exit timed hunting zone. - if (isInTimedHuntingZone(getX(), getY())) + if (isInTimedHuntingZone()) { teleToLocation(TeleportWhereType.TOWN); storeCharBase(); @@ -14603,6 +14603,11 @@ public class Player extends Playable return (holder.getMapX() == (((locX - World.WORLD_X_MIN) >> 15) + World.TILE_X_MIN)) && (holder.getMapY() == (((locY - World.WORLD_Y_MIN) >> 15) + World.TILE_Y_MIN)); } + public boolean isInTimedHuntingZone() + { + return isInTimedHuntingZone(getX(), getY()); + } + public boolean isInTimedHuntingZone(int x, int y) { for (TimedHuntingZoneHolder holder : TimedHuntingZoneData.getInstance().getAllHuntingZones()) diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/zone/type/TimedHuntingZone.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/zone/type/TimedHuntingZone.java index 4d552ef7de..aa9c7dfa6d 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/zone/type/TimedHuntingZone.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/zone/type/TimedHuntingZone.java @@ -90,7 +90,7 @@ public class TimedHuntingZone extends ZoneType ThreadPool.schedule(() -> { - if (!player.isInTimedHuntingZone(player.getX(), player.getY())) + if (!player.isInTimedHuntingZone()) { player.sendPacket(new TimedHuntingZoneExit(player.getVariables().getInt(PlayerVariables.LAST_HUNTING_ZONE_ID, 0))); } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/huntingzones/ExTimedHuntingZoneEnter.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/huntingzones/ExTimedHuntingZoneEnter.java index daeaed1ffe..50f44338df 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/huntingzones/ExTimedHuntingZoneEnter.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/huntingzones/ExTimedHuntingZoneEnter.java @@ -89,7 +89,7 @@ public class ExTimedHuntingZoneEnter implements IClientIncomingPacket player.sendMessage("Cannot use time-limited hunting zones while registered on an event."); return; } - if (player.isInInstance() || player.isInTimedHuntingZone(player.getX(), player.getY())) + if (player.isInInstance() || player.isInTimedHuntingZone()) { player.sendMessage("Cannot use time-limited hunting zones while in an instance."); return; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java index d3a42f7b92..d449b6aaf3 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java @@ -1102,7 +1102,7 @@ public class CeremonyOfChaos extends AbstractNpcAI sm = SystemMessageId.YOU_CANNOT_PARTICIPATE_IN_THE_CEREMONY_OF_CHAOS_WHILE_FISHING; canRegister = false; } - else if (player.isInTimedHuntingZone(player.getX(), player.getY())) + else if (player.isInTimedHuntingZone()) { sm = SystemMessageId.CANNOT_USE_TIME_LIMITED_HUNTING_ZONES_WHILE_WAITING_FOR_THE_CEREMONY_OF_CHAOS; canRegister = false; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/Player.java index 6f52e7273e..b8adcf2c05 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -10737,7 +10737,7 @@ public class Player extends Playable } // Close time limited zone window. - if (!isInsideZone(ZoneId.TIMED_HUNTING)) + if (!isInTimedHuntingZone()) { stopTimedHuntingZoneTask(); } @@ -11204,7 +11204,7 @@ public class Player extends Playable } // Exit timed hunting zone. - if (isInTimedHuntingZone(getX(), getY())) + if (isInTimedHuntingZone()) { teleToLocation(TeleportWhereType.TOWN); storeCharBase(); @@ -14714,6 +14714,11 @@ public class Player extends Playable return (holder.getMapX() == (((locX - World.WORLD_X_MIN) >> 15) + World.TILE_X_MIN)) && (holder.getMapY() == (((locY - World.WORLD_Y_MIN) >> 15) + World.TILE_Y_MIN)); } + public boolean isInTimedHuntingZone() + { + return isInTimedHuntingZone(getX(), getY()); + } + public boolean isInTimedHuntingZone(int x, int y) { for (TimedHuntingZoneHolder holder : TimedHuntingZoneData.getInstance().getAllHuntingZones()) diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/zone/type/TimedHuntingZone.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/zone/type/TimedHuntingZone.java index 4d552ef7de..aa9c7dfa6d 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/zone/type/TimedHuntingZone.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/zone/type/TimedHuntingZone.java @@ -90,7 +90,7 @@ public class TimedHuntingZone extends ZoneType ThreadPool.schedule(() -> { - if (!player.isInTimedHuntingZone(player.getX(), player.getY())) + if (!player.isInTimedHuntingZone()) { player.sendPacket(new TimedHuntingZoneExit(player.getVariables().getInt(PlayerVariables.LAST_HUNTING_ZONE_ID, 0))); } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/huntingzones/ExTimedHuntingZoneEnter.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/huntingzones/ExTimedHuntingZoneEnter.java index daeaed1ffe..50f44338df 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/huntingzones/ExTimedHuntingZoneEnter.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/huntingzones/ExTimedHuntingZoneEnter.java @@ -89,7 +89,7 @@ public class ExTimedHuntingZoneEnter implements IClientIncomingPacket player.sendMessage("Cannot use time-limited hunting zones while registered on an event."); return; } - if (player.isInInstance() || player.isInTimedHuntingZone(player.getX(), player.getY())) + if (player.isInInstance() || player.isInTimedHuntingZone()) { player.sendMessage("Cannot use time-limited hunting zones while in an instance."); return; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java index d3a42f7b92..d449b6aaf3 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java @@ -1102,7 +1102,7 @@ public class CeremonyOfChaos extends AbstractNpcAI sm = SystemMessageId.YOU_CANNOT_PARTICIPATE_IN_THE_CEREMONY_OF_CHAOS_WHILE_FISHING; canRegister = false; } - else if (player.isInTimedHuntingZone(player.getX(), player.getY())) + else if (player.isInTimedHuntingZone()) { sm = SystemMessageId.CANNOT_USE_TIME_LIMITED_HUNTING_ZONES_WHILE_WAITING_FOR_THE_CEREMONY_OF_CHAOS; canRegister = false; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Player.java index e80bb3172d..41d3fe3620 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -10764,7 +10764,7 @@ public class Player extends Playable } // Close time limited zone window. - if (!isInsideZone(ZoneId.TIMED_HUNTING)) + if (!isInTimedHuntingZone()) { stopTimedHuntingZoneTask(); } @@ -11231,7 +11231,7 @@ public class Player extends Playable } // Exit timed hunting zone. - if (isInTimedHuntingZone(getX(), getY())) + if (isInTimedHuntingZone()) { teleToLocation(TeleportWhereType.TOWN); storeCharBase(); @@ -14752,6 +14752,11 @@ public class Player extends Playable return (holder.getMapX() == (((locX - World.WORLD_X_MIN) >> 15) + World.TILE_X_MIN)) && (holder.getMapY() == (((locY - World.WORLD_Y_MIN) >> 15) + World.TILE_Y_MIN)); } + public boolean isInTimedHuntingZone() + { + return isInTimedHuntingZone(getX(), getY()); + } + public boolean isInTimedHuntingZone(int x, int y) { for (TimedHuntingZoneHolder holder : TimedHuntingZoneData.getInstance().getAllHuntingZones()) diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/zone/type/TimedHuntingZone.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/zone/type/TimedHuntingZone.java index 4d552ef7de..aa9c7dfa6d 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/zone/type/TimedHuntingZone.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/zone/type/TimedHuntingZone.java @@ -90,7 +90,7 @@ public class TimedHuntingZone extends ZoneType ThreadPool.schedule(() -> { - if (!player.isInTimedHuntingZone(player.getX(), player.getY())) + if (!player.isInTimedHuntingZone()) { player.sendPacket(new TimedHuntingZoneExit(player.getVariables().getInt(PlayerVariables.LAST_HUNTING_ZONE_ID, 0))); } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/huntingzones/ExTimedHuntingZoneEnter.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/huntingzones/ExTimedHuntingZoneEnter.java index daeaed1ffe..50f44338df 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/huntingzones/ExTimedHuntingZoneEnter.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/huntingzones/ExTimedHuntingZoneEnter.java @@ -89,7 +89,7 @@ public class ExTimedHuntingZoneEnter implements IClientIncomingPacket player.sendMessage("Cannot use time-limited hunting zones while registered on an event."); return; } - if (player.isInInstance() || player.isInTimedHuntingZone(player.getX(), player.getY())) + if (player.isInInstance() || player.isInTimedHuntingZone()) { player.sendMessage("Cannot use time-limited hunting zones while in an instance."); return; diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java index 0cfb3b697e..6406df1af5 100644 --- a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java @@ -1102,7 +1102,7 @@ public class CeremonyOfChaos extends AbstractNpcAI sm = SystemMessageId.YOU_CANNOT_PARTICIPATE_IN_THE_CEREMONY_OF_CHAOS_WHILE_FISHING; canRegister = false; } - else if (player.isInTimedHuntingZone(player.getX(), player.getY())) + else if (player.isInTimedHuntingZone()) { sm = SystemMessageId.SESSION_ZONES_ARE_UNAVAILABLE_WHILE_YOU_ARE_IN_QUEUE_FOR_THE_CEREMONY_OF_CHAOS; canRegister = false; diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/actor/Creature.java index f92c64346b..12f68d6195 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -572,7 +572,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe { if (isPlayer()) { - if (isInsideZone(ZoneId.TIMED_HUNTING)) + if (getActingPlayer().isInTimedHuntingZone()) { getActingPlayer().stopTimedHuntingZoneTask(); abortCast(); diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/actor/Player.java index 3e438111e9..7f7f05bfc5 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -5090,7 +5090,7 @@ public class Player extends Playable setReputation(newRep < -20 ? newRep : 0); } - if (isInsideZone(ZoneId.TIMED_HUNTING)) + if (isInTimedHuntingZone()) { DecayTaskManager.getInstance().add(this); sendPacket(new TimeRestrictFieldDieLimitTime()); @@ -10836,7 +10836,7 @@ public class Player extends Playable } // Close time limited zone window. - if (!isInsideZone(ZoneId.TIMED_HUNTING)) + if (!isInTimedHuntingZone()) { stopTimedHuntingZoneTask(); } @@ -11303,7 +11303,7 @@ public class Player extends Playable } // Exit timed hunting zone. - if (isInTimedHuntingZone(getX(), getY())) + if (isInTimedHuntingZone()) { teleToLocation(TeleportWhereType.TOWN); storeCharBase(); @@ -14836,6 +14836,11 @@ public class Player extends Playable return (holder.getMapX() == (((locX - World.WORLD_X_MIN) >> 15) + World.TILE_X_MIN)) && (holder.getMapY() == (((locY - World.WORLD_Y_MIN) >> 15) + World.TILE_Y_MIN)); } + public boolean isInTimedHuntingZone() + { + return isInTimedHuntingZone(getX(), getY()); + } + public boolean isInTimedHuntingZone(int x, int y) { for (TimedHuntingZoneHolder holder : TimedHuntingZoneData.getInstance().getAllHuntingZones()) diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/zone/type/TimedHuntingZone.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/zone/type/TimedHuntingZone.java index 4d552ef7de..aa9c7dfa6d 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/zone/type/TimedHuntingZone.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/zone/type/TimedHuntingZone.java @@ -90,7 +90,7 @@ public class TimedHuntingZone extends ZoneType ThreadPool.schedule(() -> { - if (!player.isInTimedHuntingZone(player.getX(), player.getY())) + if (!player.isInTimedHuntingZone()) { player.sendPacket(new TimedHuntingZoneExit(player.getVariables().getInt(PlayerVariables.LAST_HUNTING_ZONE_ID, 0))); } diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/huntingzones/ExTimedHuntingZoneEnter.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/huntingzones/ExTimedHuntingZoneEnter.java index a3352f5e25..0238cbb818 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/huntingzones/ExTimedHuntingZoneEnter.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/huntingzones/ExTimedHuntingZoneEnter.java @@ -89,7 +89,7 @@ public class ExTimedHuntingZoneEnter implements IClientIncomingPacket player.sendMessage("Cannot use time-limited hunting zones while registered on an event."); return; } - if (player.isInInstance() || player.isInTimedHuntingZone(player.getX(), player.getY())) + if (player.isInInstance() || player.isInTimedHuntingZone()) { player.sendMessage("Cannot use time-limited hunting zones while in an instance."); return; diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java index 7860e5f1d9..cea00ddf12 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java @@ -25,7 +25,6 @@ import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.zone.ZoneId; /** * @author Mobius @@ -92,14 +91,14 @@ public class DecayTaskManager implements Runnable if (creature.isPlayer()) { - if (Config.DISCONNECT_AFTER_DEATH) - { - delay = 3600; // 1 hour - } - if (creature.isInsideZone(ZoneId.TIMED_HUNTING)) + if (creature.getActingPlayer().isInTimedHuntingZone()) { delay = 60; // 10 minutes } + else if (Config.DISCONNECT_AFTER_DEATH) + { + delay = 3600; // 1 hour + } } // Add to decay schedules. 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 d561fa24c4..e084868fd0 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 @@ -10386,7 +10386,7 @@ public class Player extends Playable } // Close time limited zone window. - if (!isInsideZone(ZoneId.TIMED_HUNTING)) + if (!isInTimedHuntingZone()) { stopTimedHuntingZoneTask(); } @@ -10848,7 +10848,7 @@ public class Player extends Playable } // Exit timed hunting zone. - if (isInTimedHuntingZone(getX(), getY())) + if (isInTimedHuntingZone()) { teleToLocation(TeleportWhereType.TOWN); storeCharBase(); @@ -14516,6 +14516,11 @@ public class Player extends Playable return (holder.getMapX() == (((locX - World.WORLD_X_MIN) >> 15) + World.TILE_X_MIN)) && (holder.getMapY() == (((locY - World.WORLD_Y_MIN) >> 15) + World.TILE_Y_MIN)); } + public boolean isInTimedHuntingZone() + { + return isInTimedHuntingZone(getX(), getY()); + } + public boolean isInTimedHuntingZone(int x, int y) { for (TimedHuntingZoneHolder holder : TimedHuntingZoneData.getInstance().getAllHuntingZones()) diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/zone/type/TimedHuntingZone.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/zone/type/TimedHuntingZone.java index 4d552ef7de..aa9c7dfa6d 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/zone/type/TimedHuntingZone.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/zone/type/TimedHuntingZone.java @@ -90,7 +90,7 @@ public class TimedHuntingZone extends ZoneType ThreadPool.schedule(() -> { - if (!player.isInTimedHuntingZone(player.getX(), player.getY())) + if (!player.isInTimedHuntingZone()) { player.sendPacket(new TimedHuntingZoneExit(player.getVariables().getInt(PlayerVariables.LAST_HUNTING_ZONE_ID, 0))); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/huntingzones/ExTimedHuntingZoneEnter.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/huntingzones/ExTimedHuntingZoneEnter.java index c5c47a110e..8e4e03fc3f 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/huntingzones/ExTimedHuntingZoneEnter.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/huntingzones/ExTimedHuntingZoneEnter.java @@ -89,7 +89,7 @@ public class ExTimedHuntingZoneEnter implements IClientIncomingPacket player.sendMessage("Cannot use time-limited hunting zones while registered on an event."); return; } - if (player.isInInstance() || player.isInTimedHuntingZone(player.getX(), player.getY())) + if (player.isInInstance() || player.isInTimedHuntingZone()) { player.sendMessage("Cannot use time-limited hunting zones while in an instance."); return; 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 f41bb2c92f..eb73a40f0f 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 @@ -10562,7 +10562,7 @@ public class Player extends Playable } // Close time limited zone window. - if (!isInsideZone(ZoneId.TIMED_HUNTING)) + if (!isInTimedHuntingZone()) { stopTimedHuntingZoneTask(); } @@ -11034,7 +11034,7 @@ public class Player extends Playable } // Exit timed hunting zone. - if (isInTimedHuntingZone(getX(), getY())) + if (isInTimedHuntingZone()) { teleToLocation(TeleportWhereType.TOWN); storeCharBase(); @@ -14802,6 +14802,11 @@ public class Player extends Playable return (holder.getMapX() == (((locX - World.WORLD_X_MIN) >> 15) + World.TILE_X_MIN)) && (holder.getMapY() == (((locY - World.WORLD_Y_MIN) >> 15) + World.TILE_Y_MIN)); } + public boolean isInTimedHuntingZone() + { + return isInTimedHuntingZone(getX(), getY()); + } + public boolean isInTimedHuntingZone(int x, int y) { for (TimedHuntingZoneHolder holder : TimedHuntingZoneData.getInstance().getAllHuntingZones()) diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/zone/type/TimedHuntingZone.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/zone/type/TimedHuntingZone.java index 4d552ef7de..aa9c7dfa6d 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/zone/type/TimedHuntingZone.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/zone/type/TimedHuntingZone.java @@ -90,7 +90,7 @@ public class TimedHuntingZone extends ZoneType ThreadPool.schedule(() -> { - if (!player.isInTimedHuntingZone(player.getX(), player.getY())) + if (!player.isInTimedHuntingZone()) { player.sendPacket(new TimedHuntingZoneExit(player.getVariables().getInt(PlayerVariables.LAST_HUNTING_ZONE_ID, 0))); } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/huntingzones/ExTimedHuntingZoneEnter.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/huntingzones/ExTimedHuntingZoneEnter.java index 67a5417859..0b1edf5712 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/huntingzones/ExTimedHuntingZoneEnter.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/huntingzones/ExTimedHuntingZoneEnter.java @@ -89,7 +89,7 @@ public class ExTimedHuntingZoneEnter implements IClientIncomingPacket player.sendMessage("Cannot use time-limited hunting zones while registered on an event."); return; } - if (player.isInInstance() || player.isInTimedHuntingZone(player.getX(), player.getY())) + if (player.isInInstance() || player.isInTimedHuntingZone()) { player.sendMessage("Cannot use time-limited hunting zones while in an instance."); return; 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 529bd692bd..6de35b2c77 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 @@ -10619,7 +10619,7 @@ public class Player extends Playable } // Close time limited zone window. - if (!isInsideZone(ZoneId.TIMED_HUNTING)) + if (!isInTimedHuntingZone()) { stopTimedHuntingZoneTask(); } @@ -11091,7 +11091,7 @@ public class Player extends Playable } // Exit timed hunting zone. - if (isInTimedHuntingZone(getX(), getY())) + if (isInTimedHuntingZone()) { teleToLocation(TeleportWhereType.TOWN); storeCharBase(); @@ -14885,6 +14885,11 @@ public class Player extends Playable return (holder.getMapX() == (((locX - World.WORLD_X_MIN) >> 15) + World.TILE_X_MIN)) && (holder.getMapY() == (((locY - World.WORLD_Y_MIN) >> 15) + World.TILE_Y_MIN)); } + public boolean isInTimedHuntingZone() + { + return isInTimedHuntingZone(getX(), getY()); + } + public boolean isInTimedHuntingZone(int x, int y) { for (TimedHuntingZoneHolder holder : TimedHuntingZoneData.getInstance().getAllHuntingZones()) diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/zone/type/TimedHuntingZone.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/zone/type/TimedHuntingZone.java index 4d552ef7de..aa9c7dfa6d 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/zone/type/TimedHuntingZone.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/zone/type/TimedHuntingZone.java @@ -90,7 +90,7 @@ public class TimedHuntingZone extends ZoneType ThreadPool.schedule(() -> { - if (!player.isInTimedHuntingZone(player.getX(), player.getY())) + if (!player.isInTimedHuntingZone()) { player.sendPacket(new TimedHuntingZoneExit(player.getVariables().getInt(PlayerVariables.LAST_HUNTING_ZONE_ID, 0))); } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/huntingzones/ExTimedHuntingZoneEnter.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/huntingzones/ExTimedHuntingZoneEnter.java index 67a5417859..0b1edf5712 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/huntingzones/ExTimedHuntingZoneEnter.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/huntingzones/ExTimedHuntingZoneEnter.java @@ -89,7 +89,7 @@ public class ExTimedHuntingZoneEnter implements IClientIncomingPacket player.sendMessage("Cannot use time-limited hunting zones while registered on an event."); return; } - if (player.isInInstance() || player.isInTimedHuntingZone(player.getX(), player.getY())) + if (player.isInInstance() || player.isInTimedHuntingZone()) { player.sendMessage("Cannot use time-limited hunting zones while in an instance."); return; diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/actor/Creature.java index 07cc819ce2..e00430814b 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -573,7 +573,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe { if (isPlayer()) { - if (isInsideZone(ZoneId.TIMED_HUNTING)) + if (getActingPlayer().isInTimedHuntingZone()) { getActingPlayer().stopTimedHuntingZoneTask(); abortCast(); 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 435c0fd866..474d041859 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 @@ -5100,7 +5100,7 @@ public class Player extends Playable setReputation(newRep < -20 ? newRep : 0); } - if (isInsideZone(ZoneId.TIMED_HUNTING)) + if (isInTimedHuntingZone()) { DecayTaskManager.getInstance().add(this); sendPacket(new TimeRestrictFieldDieLimitTime()); @@ -10834,7 +10834,7 @@ public class Player extends Playable } // Close time limited zone window. - if (!isInsideZone(ZoneId.TIMED_HUNTING)) + if (!isInTimedHuntingZone()) { stopTimedHuntingZoneTask(); } @@ -11306,7 +11306,7 @@ public class Player extends Playable } // Exit timed hunting zone. - if (isInTimedHuntingZone(getX(), getY())) + if (isInTimedHuntingZone()) { teleToLocation(TeleportWhereType.TOWN); storeCharBase(); @@ -15139,6 +15139,11 @@ public class Player extends Playable return (holder.getMapX() == (((locX - World.WORLD_X_MIN) >> 15) + World.TILE_X_MIN)) && (holder.getMapY() == (((locY - World.WORLD_Y_MIN) >> 15) + World.TILE_Y_MIN)); } + public boolean isInTimedHuntingZone() + { + return isInTimedHuntingZone(getX(), getY()); + } + public boolean isInTimedHuntingZone(int x, int y) { for (TimedHuntingZoneHolder holder : TimedHuntingZoneData.getInstance().getAllHuntingZones()) diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/zone/type/TimedHuntingZone.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/zone/type/TimedHuntingZone.java index 4d552ef7de..aa9c7dfa6d 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/zone/type/TimedHuntingZone.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/zone/type/TimedHuntingZone.java @@ -90,7 +90,7 @@ public class TimedHuntingZone extends ZoneType ThreadPool.schedule(() -> { - if (!player.isInTimedHuntingZone(player.getX(), player.getY())) + if (!player.isInTimedHuntingZone()) { player.sendPacket(new TimedHuntingZoneExit(player.getVariables().getInt(PlayerVariables.LAST_HUNTING_ZONE_ID, 0))); } diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/huntingzones/ExTimedHuntingZoneEnter.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/huntingzones/ExTimedHuntingZoneEnter.java index 67a5417859..0b1edf5712 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/huntingzones/ExTimedHuntingZoneEnter.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/huntingzones/ExTimedHuntingZoneEnter.java @@ -89,7 +89,7 @@ public class ExTimedHuntingZoneEnter implements IClientIncomingPacket player.sendMessage("Cannot use time-limited hunting zones while registered on an event."); return; } - if (player.isInInstance() || player.isInTimedHuntingZone(player.getX(), player.getY())) + if (player.isInInstance() || player.isInTimedHuntingZone()) { player.sendMessage("Cannot use time-limited hunting zones while in an instance."); return; diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java index c2726e5368..dc79d21d31 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java @@ -25,7 +25,6 @@ import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.zone.ZoneId; /** * @author Mobius @@ -100,14 +99,14 @@ public class DecayTaskManager implements Runnable if (creature.isPlayer()) { - if (Config.DISCONNECT_AFTER_DEATH) - { - delay = 3600; // 1 hour - } - if (creature.isInsideZone(ZoneId.TIMED_HUNTING)) + if (creature.getActingPlayer().isInTimedHuntingZone()) { delay = 60; // 10 minutes } + else if (Config.DISCONNECT_AFTER_DEATH) + { + delay = 3600; // 1 hour + } } // Add to decay schedules.