Changed order of timed hunting zone UI packets.
This commit is contained in:
parent
7241ea6635
commit
ef9c20e8b4
@ -24,6 +24,7 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
|
|||||||
import org.l2jmobius.gameserver.model.holders.TimedHuntingZoneHolder;
|
import org.l2jmobius.gameserver.model.holders.TimedHuntingZoneHolder;
|
||||||
import org.l2jmobius.gameserver.model.zone.ZoneId;
|
import org.l2jmobius.gameserver.model.zone.ZoneId;
|
||||||
import org.l2jmobius.gameserver.model.zone.ZoneType;
|
import org.l2jmobius.gameserver.model.zone.ZoneType;
|
||||||
|
import org.l2jmobius.gameserver.network.serverpackets.huntingzones.TimedHuntingZoneClose;
|
||||||
import org.l2jmobius.gameserver.network.serverpackets.huntingzones.TimedHuntingZoneExit;
|
import org.l2jmobius.gameserver.network.serverpackets.huntingzones.TimedHuntingZoneExit;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -75,6 +76,7 @@ public class TimedHuntingZone extends ZoneType
|
|||||||
{
|
{
|
||||||
player.setInsideZone(ZoneId.TIMED_HUNTING, false);
|
player.setInsideZone(ZoneId.TIMED_HUNTING, false);
|
||||||
player.sendPacket(TimedHuntingZoneExit.STATIC_PACKET);
|
player.sendPacket(TimedHuntingZoneExit.STATIC_PACKET);
|
||||||
|
player.sendPacket(TimedHuntingZoneClose.STATIC_PACKET);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -159,11 +159,11 @@ public class ExTimedHuntingZoneEnter implements IClientIncomingPacket
|
|||||||
QuestManager.getInstance().getQuest("TranscendentZone").notifyEvent("ENTER " + _zoneId, null, player);
|
QuestManager.getInstance().getQuest("TranscendentZone").notifyEvent("ENTER " + _zoneId, null, player);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Send time icon.
|
|
||||||
player.sendPacket(new TimedHuntingZoneEnter(player, _zoneId));
|
|
||||||
|
|
||||||
// Close window.
|
// Close window.
|
||||||
player.sendPacket(TimedHuntingZoneClose.STATIC_PACKET);
|
player.sendPacket(TimedHuntingZoneClose.STATIC_PACKET);
|
||||||
|
|
||||||
|
// Send time icon.
|
||||||
|
player.sendPacket(new TimedHuntingZoneEnter(player, _zoneId));
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
@ -24,6 +24,7 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
|
|||||||
import org.l2jmobius.gameserver.model.holders.TimedHuntingZoneHolder;
|
import org.l2jmobius.gameserver.model.holders.TimedHuntingZoneHolder;
|
||||||
import org.l2jmobius.gameserver.model.zone.ZoneId;
|
import org.l2jmobius.gameserver.model.zone.ZoneId;
|
||||||
import org.l2jmobius.gameserver.model.zone.ZoneType;
|
import org.l2jmobius.gameserver.model.zone.ZoneType;
|
||||||
|
import org.l2jmobius.gameserver.network.serverpackets.huntingzones.TimedHuntingZoneClose;
|
||||||
import org.l2jmobius.gameserver.network.serverpackets.huntingzones.TimedHuntingZoneExit;
|
import org.l2jmobius.gameserver.network.serverpackets.huntingzones.TimedHuntingZoneExit;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -75,6 +76,7 @@ public class TimedHuntingZone extends ZoneType
|
|||||||
{
|
{
|
||||||
player.setInsideZone(ZoneId.TIMED_HUNTING, false);
|
player.setInsideZone(ZoneId.TIMED_HUNTING, false);
|
||||||
player.sendPacket(TimedHuntingZoneExit.STATIC_PACKET);
|
player.sendPacket(TimedHuntingZoneExit.STATIC_PACKET);
|
||||||
|
player.sendPacket(TimedHuntingZoneClose.STATIC_PACKET);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -159,11 +159,11 @@ public class ExTimedHuntingZoneEnter implements IClientIncomingPacket
|
|||||||
QuestManager.getInstance().getQuest("TranscendentZone").notifyEvent("ENTER " + _zoneId, null, player);
|
QuestManager.getInstance().getQuest("TranscendentZone").notifyEvent("ENTER " + _zoneId, null, player);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Send time icon.
|
|
||||||
player.sendPacket(new TimedHuntingZoneEnter(player, _zoneId));
|
|
||||||
|
|
||||||
// Close window.
|
// Close window.
|
||||||
player.sendPacket(TimedHuntingZoneClose.STATIC_PACKET);
|
player.sendPacket(TimedHuntingZoneClose.STATIC_PACKET);
|
||||||
|
|
||||||
|
// Send time icon.
|
||||||
|
player.sendPacket(new TimedHuntingZoneEnter(player, _zoneId));
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
@ -24,6 +24,7 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
|
|||||||
import org.l2jmobius.gameserver.model.holders.TimedHuntingZoneHolder;
|
import org.l2jmobius.gameserver.model.holders.TimedHuntingZoneHolder;
|
||||||
import org.l2jmobius.gameserver.model.zone.ZoneId;
|
import org.l2jmobius.gameserver.model.zone.ZoneId;
|
||||||
import org.l2jmobius.gameserver.model.zone.ZoneType;
|
import org.l2jmobius.gameserver.model.zone.ZoneType;
|
||||||
|
import org.l2jmobius.gameserver.network.serverpackets.huntingzones.TimedHuntingZoneClose;
|
||||||
import org.l2jmobius.gameserver.network.serverpackets.huntingzones.TimedHuntingZoneExit;
|
import org.l2jmobius.gameserver.network.serverpackets.huntingzones.TimedHuntingZoneExit;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -75,6 +76,7 @@ public class TimedHuntingZone extends ZoneType
|
|||||||
{
|
{
|
||||||
player.setInsideZone(ZoneId.TIMED_HUNTING, false);
|
player.setInsideZone(ZoneId.TIMED_HUNTING, false);
|
||||||
player.sendPacket(TimedHuntingZoneExit.STATIC_PACKET);
|
player.sendPacket(TimedHuntingZoneExit.STATIC_PACKET);
|
||||||
|
player.sendPacket(TimedHuntingZoneClose.STATIC_PACKET);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -159,11 +159,11 @@ public class ExTimedHuntingZoneEnter implements IClientIncomingPacket
|
|||||||
QuestManager.getInstance().getQuest("TranscendentZone").notifyEvent("ENTER " + _zoneId, null, player);
|
QuestManager.getInstance().getQuest("TranscendentZone").notifyEvent("ENTER " + _zoneId, null, player);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Send time icon.
|
|
||||||
player.sendPacket(new TimedHuntingZoneEnter(player, _zoneId));
|
|
||||||
|
|
||||||
// Close window.
|
// Close window.
|
||||||
player.sendPacket(TimedHuntingZoneClose.STATIC_PACKET);
|
player.sendPacket(TimedHuntingZoneClose.STATIC_PACKET);
|
||||||
|
|
||||||
|
// Send time icon.
|
||||||
|
player.sendPacket(new TimedHuntingZoneEnter(player, _zoneId));
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
@ -24,6 +24,7 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
|
|||||||
import org.l2jmobius.gameserver.model.holders.TimedHuntingZoneHolder;
|
import org.l2jmobius.gameserver.model.holders.TimedHuntingZoneHolder;
|
||||||
import org.l2jmobius.gameserver.model.zone.ZoneId;
|
import org.l2jmobius.gameserver.model.zone.ZoneId;
|
||||||
import org.l2jmobius.gameserver.model.zone.ZoneType;
|
import org.l2jmobius.gameserver.model.zone.ZoneType;
|
||||||
|
import org.l2jmobius.gameserver.network.serverpackets.huntingzones.TimedHuntingZoneClose;
|
||||||
import org.l2jmobius.gameserver.network.serverpackets.huntingzones.TimedHuntingZoneExit;
|
import org.l2jmobius.gameserver.network.serverpackets.huntingzones.TimedHuntingZoneExit;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -75,6 +76,7 @@ public class TimedHuntingZone extends ZoneType
|
|||||||
{
|
{
|
||||||
player.setInsideZone(ZoneId.TIMED_HUNTING, false);
|
player.setInsideZone(ZoneId.TIMED_HUNTING, false);
|
||||||
player.sendPacket(TimedHuntingZoneExit.STATIC_PACKET);
|
player.sendPacket(TimedHuntingZoneExit.STATIC_PACKET);
|
||||||
|
player.sendPacket(TimedHuntingZoneClose.STATIC_PACKET);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -150,18 +150,20 @@ public class ExTimedHuntingZoneEnter implements IClientIncomingPacket
|
|||||||
|
|
||||||
player.getVariables().set(PlayerVariables.HUNTING_ZONE_TIME + _zoneId, endTime - currentTime);
|
player.getVariables().set(PlayerVariables.HUNTING_ZONE_TIME + _zoneId, endTime - currentTime);
|
||||||
|
|
||||||
|
// Close window.
|
||||||
|
player.sendPacket(TimedHuntingZoneClose.STATIC_PACKET);
|
||||||
|
|
||||||
if (instanceId == 0)
|
if (instanceId == 0)
|
||||||
{
|
{
|
||||||
player.teleToLocation(holder.getEnterLocation());
|
player.teleToLocation(holder.getEnterLocation());
|
||||||
|
|
||||||
|
// Send time icon.
|
||||||
player.sendPacket(new TimedHuntingZoneEnter(player, _zoneId));
|
player.sendPacket(new TimedHuntingZoneEnter(player, _zoneId));
|
||||||
}
|
}
|
||||||
else // Transcendent zones.
|
else // Transcendent zones.
|
||||||
{
|
{
|
||||||
QuestManager.getInstance().getQuest("TranscendentZone").notifyEvent("ENTER " + _zoneId, null, player);
|
QuestManager.getInstance().getQuest("TranscendentZone").notifyEvent("ENTER " + _zoneId, null, player);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Close window.
|
|
||||||
player.sendPacket(TimedHuntingZoneClose.STATIC_PACKET);
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
@ -24,6 +24,7 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
|
|||||||
import org.l2jmobius.gameserver.model.holders.TimedHuntingZoneHolder;
|
import org.l2jmobius.gameserver.model.holders.TimedHuntingZoneHolder;
|
||||||
import org.l2jmobius.gameserver.model.zone.ZoneId;
|
import org.l2jmobius.gameserver.model.zone.ZoneId;
|
||||||
import org.l2jmobius.gameserver.model.zone.ZoneType;
|
import org.l2jmobius.gameserver.model.zone.ZoneType;
|
||||||
|
import org.l2jmobius.gameserver.network.serverpackets.huntingzones.TimedHuntingZoneClose;
|
||||||
import org.l2jmobius.gameserver.network.serverpackets.huntingzones.TimedHuntingZoneExit;
|
import org.l2jmobius.gameserver.network.serverpackets.huntingzones.TimedHuntingZoneExit;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -75,6 +76,7 @@ public class TimedHuntingZone extends ZoneType
|
|||||||
{
|
{
|
||||||
player.setInsideZone(ZoneId.TIMED_HUNTING, false);
|
player.setInsideZone(ZoneId.TIMED_HUNTING, false);
|
||||||
player.sendPacket(TimedHuntingZoneExit.STATIC_PACKET);
|
player.sendPacket(TimedHuntingZoneExit.STATIC_PACKET);
|
||||||
|
player.sendPacket(TimedHuntingZoneClose.STATIC_PACKET);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -158,18 +158,20 @@ public class ExTimedHuntingZoneEnter implements IClientIncomingPacket
|
|||||||
|
|
||||||
player.getVariables().set(PlayerVariables.HUNTING_ZONE_TIME + _zoneId, endTime - currentTime);
|
player.getVariables().set(PlayerVariables.HUNTING_ZONE_TIME + _zoneId, endTime - currentTime);
|
||||||
|
|
||||||
|
// Close window.
|
||||||
|
player.sendPacket(TimedHuntingZoneClose.STATIC_PACKET);
|
||||||
|
|
||||||
if (instanceId == 0)
|
if (instanceId == 0)
|
||||||
{
|
{
|
||||||
player.teleToLocation(holder.getEnterLocation());
|
player.teleToLocation(holder.getEnterLocation());
|
||||||
|
|
||||||
|
// Send time icon.
|
||||||
player.sendPacket(new TimedHuntingZoneEnter(player, _zoneId));
|
player.sendPacket(new TimedHuntingZoneEnter(player, _zoneId));
|
||||||
}
|
}
|
||||||
else // Transcendent zones.
|
else // Transcendent zones.
|
||||||
{
|
{
|
||||||
QuestManager.getInstance().getQuest("TranscendentZone").notifyEvent("ENTER " + _zoneId, null, player);
|
QuestManager.getInstance().getQuest("TranscendentZone").notifyEvent("ENTER " + _zoneId, null, player);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Close window.
|
|
||||||
player.sendPacket(TimedHuntingZoneClose.STATIC_PACKET);
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
@ -24,6 +24,7 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
|
|||||||
import org.l2jmobius.gameserver.model.holders.TimedHuntingZoneHolder;
|
import org.l2jmobius.gameserver.model.holders.TimedHuntingZoneHolder;
|
||||||
import org.l2jmobius.gameserver.model.zone.ZoneId;
|
import org.l2jmobius.gameserver.model.zone.ZoneId;
|
||||||
import org.l2jmobius.gameserver.model.zone.ZoneType;
|
import org.l2jmobius.gameserver.model.zone.ZoneType;
|
||||||
|
import org.l2jmobius.gameserver.network.serverpackets.huntingzones.TimedHuntingZoneClose;
|
||||||
import org.l2jmobius.gameserver.network.serverpackets.huntingzones.TimedHuntingZoneExit;
|
import org.l2jmobius.gameserver.network.serverpackets.huntingzones.TimedHuntingZoneExit;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -75,6 +76,7 @@ public class TimedHuntingZone extends ZoneType
|
|||||||
{
|
{
|
||||||
player.setInsideZone(ZoneId.TIMED_HUNTING, false);
|
player.setInsideZone(ZoneId.TIMED_HUNTING, false);
|
||||||
player.sendPacket(TimedHuntingZoneExit.STATIC_PACKET);
|
player.sendPacket(TimedHuntingZoneExit.STATIC_PACKET);
|
||||||
|
player.sendPacket(TimedHuntingZoneClose.STATIC_PACKET);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -158,18 +158,20 @@ public class ExTimedHuntingZoneEnter implements IClientIncomingPacket
|
|||||||
|
|
||||||
player.getVariables().set(PlayerVariables.HUNTING_ZONE_TIME + _zoneId, endTime - currentTime);
|
player.getVariables().set(PlayerVariables.HUNTING_ZONE_TIME + _zoneId, endTime - currentTime);
|
||||||
|
|
||||||
|
// Close window.
|
||||||
|
player.sendPacket(TimedHuntingZoneClose.STATIC_PACKET);
|
||||||
|
|
||||||
if (instanceId == 0)
|
if (instanceId == 0)
|
||||||
{
|
{
|
||||||
player.teleToLocation(holder.getEnterLocation());
|
player.teleToLocation(holder.getEnterLocation());
|
||||||
|
|
||||||
|
// Send time icon.
|
||||||
player.sendPacket(new TimedHuntingZoneEnter(player, _zoneId));
|
player.sendPacket(new TimedHuntingZoneEnter(player, _zoneId));
|
||||||
}
|
}
|
||||||
else // Transcendent zones.
|
else // Transcendent zones.
|
||||||
{
|
{
|
||||||
QuestManager.getInstance().getQuest("TranscendentZone").notifyEvent("ENTER " + _zoneId, null, player);
|
QuestManager.getInstance().getQuest("TranscendentZone").notifyEvent("ENTER " + _zoneId, null, player);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Close window.
|
|
||||||
player.sendPacket(TimedHuntingZoneClose.STATIC_PACKET);
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
Loading…
Reference in New Issue
Block a user