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 b7ca293e50..5d01f72d36 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 @@ -24,6 +24,7 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.holders.TimedHuntingZoneHolder; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.model.zone.ZoneType; +import org.l2jmobius.gameserver.network.serverpackets.huntingzones.TimedHuntingZoneClose; import org.l2jmobius.gameserver.network.serverpackets.huntingzones.TimedHuntingZoneExit; /** @@ -75,6 +76,7 @@ public class TimedHuntingZone extends ZoneType { player.setInsideZone(ZoneId.TIMED_HUNTING, false); player.sendPacket(TimedHuntingZoneExit.STATIC_PACKET); + player.sendPacket(TimedHuntingZoneClose.STATIC_PACKET); } } } 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 1fe56d0ec1..f2e129c77a 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 @@ -159,11 +159,11 @@ public class ExTimedHuntingZoneEnter implements IClientIncomingPacket QuestManager.getInstance().getQuest("TranscendentZone").notifyEvent("ENTER " + _zoneId, null, player); } - // Send time icon. - player.sendPacket(new TimedHuntingZoneEnter(player, _zoneId)); - // Close window. player.sendPacket(TimedHuntingZoneClose.STATIC_PACKET); + + // Send time icon. + player.sendPacket(new TimedHuntingZoneEnter(player, _zoneId)); } else { 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 b7ca293e50..5d01f72d36 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 @@ -24,6 +24,7 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.holders.TimedHuntingZoneHolder; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.model.zone.ZoneType; +import org.l2jmobius.gameserver.network.serverpackets.huntingzones.TimedHuntingZoneClose; import org.l2jmobius.gameserver.network.serverpackets.huntingzones.TimedHuntingZoneExit; /** @@ -75,6 +76,7 @@ public class TimedHuntingZone extends ZoneType { player.setInsideZone(ZoneId.TIMED_HUNTING, false); player.sendPacket(TimedHuntingZoneExit.STATIC_PACKET); + player.sendPacket(TimedHuntingZoneClose.STATIC_PACKET); } } } 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 1fe56d0ec1..f2e129c77a 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 @@ -159,11 +159,11 @@ public class ExTimedHuntingZoneEnter implements IClientIncomingPacket QuestManager.getInstance().getQuest("TranscendentZone").notifyEvent("ENTER " + _zoneId, null, player); } - // Send time icon. - player.sendPacket(new TimedHuntingZoneEnter(player, _zoneId)); - // Close window. player.sendPacket(TimedHuntingZoneClose.STATIC_PACKET); + + // Send time icon. + player.sendPacket(new TimedHuntingZoneEnter(player, _zoneId)); } else { 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 b7ca293e50..5d01f72d36 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 @@ -24,6 +24,7 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.holders.TimedHuntingZoneHolder; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.model.zone.ZoneType; +import org.l2jmobius.gameserver.network.serverpackets.huntingzones.TimedHuntingZoneClose; import org.l2jmobius.gameserver.network.serverpackets.huntingzones.TimedHuntingZoneExit; /** @@ -75,6 +76,7 @@ public class TimedHuntingZone extends ZoneType { player.setInsideZone(ZoneId.TIMED_HUNTING, false); player.sendPacket(TimedHuntingZoneExit.STATIC_PACKET); + player.sendPacket(TimedHuntingZoneClose.STATIC_PACKET); } } } 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 1fe56d0ec1..f2e129c77a 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 @@ -159,11 +159,11 @@ public class ExTimedHuntingZoneEnter implements IClientIncomingPacket QuestManager.getInstance().getQuest("TranscendentZone").notifyEvent("ENTER " + _zoneId, null, player); } - // Send time icon. - player.sendPacket(new TimedHuntingZoneEnter(player, _zoneId)); - // Close window. player.sendPacket(TimedHuntingZoneClose.STATIC_PACKET); + + // Send time icon. + player.sendPacket(new TimedHuntingZoneEnter(player, _zoneId)); } else { 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 b7ca293e50..5d01f72d36 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 @@ -24,6 +24,7 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.holders.TimedHuntingZoneHolder; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.model.zone.ZoneType; +import org.l2jmobius.gameserver.network.serverpackets.huntingzones.TimedHuntingZoneClose; import org.l2jmobius.gameserver.network.serverpackets.huntingzones.TimedHuntingZoneExit; /** @@ -75,6 +76,7 @@ public class TimedHuntingZone extends ZoneType { player.setInsideZone(ZoneId.TIMED_HUNTING, false); player.sendPacket(TimedHuntingZoneExit.STATIC_PACKET); + player.sendPacket(TimedHuntingZoneClose.STATIC_PACKET); } } } 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 ebcf57564e..0cefd37a6b 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 @@ -150,18 +150,20 @@ public class ExTimedHuntingZoneEnter implements IClientIncomingPacket player.getVariables().set(PlayerVariables.HUNTING_ZONE_TIME + _zoneId, endTime - currentTime); + // Close window. + player.sendPacket(TimedHuntingZoneClose.STATIC_PACKET); + if (instanceId == 0) { player.teleToLocation(holder.getEnterLocation()); + + // Send time icon. player.sendPacket(new TimedHuntingZoneEnter(player, _zoneId)); } else // Transcendent zones. { QuestManager.getInstance().getQuest("TranscendentZone").notifyEvent("ENTER " + _zoneId, null, player); } - - // Close window. - player.sendPacket(TimedHuntingZoneClose.STATIC_PACKET); } else { 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 b7ca293e50..5d01f72d36 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 @@ -24,6 +24,7 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.holders.TimedHuntingZoneHolder; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.model.zone.ZoneType; +import org.l2jmobius.gameserver.network.serverpackets.huntingzones.TimedHuntingZoneClose; import org.l2jmobius.gameserver.network.serverpackets.huntingzones.TimedHuntingZoneExit; /** @@ -75,6 +76,7 @@ public class TimedHuntingZone extends ZoneType { player.setInsideZone(ZoneId.TIMED_HUNTING, false); player.sendPacket(TimedHuntingZoneExit.STATIC_PACKET); + player.sendPacket(TimedHuntingZoneClose.STATIC_PACKET); } } } 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 47ff71c2b7..bf383d2e1f 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 @@ -158,18 +158,20 @@ public class ExTimedHuntingZoneEnter implements IClientIncomingPacket player.getVariables().set(PlayerVariables.HUNTING_ZONE_TIME + _zoneId, endTime - currentTime); + // Close window. + player.sendPacket(TimedHuntingZoneClose.STATIC_PACKET); + if (instanceId == 0) { player.teleToLocation(holder.getEnterLocation()); + + // Send time icon. player.sendPacket(new TimedHuntingZoneEnter(player, _zoneId)); } else // Transcendent zones. { QuestManager.getInstance().getQuest("TranscendentZone").notifyEvent("ENTER " + _zoneId, null, player); } - - // Close window. - player.sendPacket(TimedHuntingZoneClose.STATIC_PACKET); } else { 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 b7ca293e50..5d01f72d36 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 @@ -24,6 +24,7 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.holders.TimedHuntingZoneHolder; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.model.zone.ZoneType; +import org.l2jmobius.gameserver.network.serverpackets.huntingzones.TimedHuntingZoneClose; import org.l2jmobius.gameserver.network.serverpackets.huntingzones.TimedHuntingZoneExit; /** @@ -75,6 +76,7 @@ public class TimedHuntingZone extends ZoneType { player.setInsideZone(ZoneId.TIMED_HUNTING, false); player.sendPacket(TimedHuntingZoneExit.STATIC_PACKET); + player.sendPacket(TimedHuntingZoneClose.STATIC_PACKET); } } } 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 47ff71c2b7..bf383d2e1f 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 @@ -158,18 +158,20 @@ public class ExTimedHuntingZoneEnter implements IClientIncomingPacket player.getVariables().set(PlayerVariables.HUNTING_ZONE_TIME + _zoneId, endTime - currentTime); + // Close window. + player.sendPacket(TimedHuntingZoneClose.STATIC_PACKET); + if (instanceId == 0) { player.teleToLocation(holder.getEnterLocation()); + + // Send time icon. player.sendPacket(new TimedHuntingZoneEnter(player, _zoneId)); } else // Transcendent zones. { QuestManager.getInstance().getQuest("TranscendentZone").notifyEvent("ENTER " + _zoneId, null, player); } - - // Close window. - player.sendPacket(TimedHuntingZoneClose.STATIC_PACKET); } else {