From 6a9564a324e76c7e575202d75dd7aabca329eb92 Mon Sep 17 00:00:00 2001 From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com> Date: Mon, 13 Nov 2017 20:23:01 +0000 Subject: [PATCH] Updated instancezone command. --- .../scripts/handlers/playeractions/InstanceZoneInfo.java | 2 +- .../scripts/handlers/usercommandhandlers/InstanceZone.java | 2 +- .../network/clientpackets/RequestInzoneWaitingTime.java | 2 +- .../gameserver/network/serverpackets/ExInzoneWaiting.java | 6 ++++-- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/playeractions/InstanceZoneInfo.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/playeractions/InstanceZoneInfo.java index 0644b22915..d2f245154f 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/playeractions/InstanceZoneInfo.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/playeractions/InstanceZoneInfo.java @@ -30,6 +30,6 @@ public final class InstanceZoneInfo implements IPlayerActionHandler @Override public void useAction(L2PcInstance activeChar, ActionDataHolder data, boolean ctrlPressed, boolean shiftPressed) { - activeChar.sendPacket(new ExInzoneWaiting(activeChar)); + activeChar.sendPacket(new ExInzoneWaiting(activeChar, false)); } } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/usercommandhandlers/InstanceZone.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/usercommandhandlers/InstanceZone.java index b0bc10bd40..7adb3c0db6 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/usercommandhandlers/InstanceZone.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/usercommandhandlers/InstanceZone.java @@ -44,7 +44,7 @@ public class InstanceZone implements IUserCommandHandler { return false; } - activeChar.sendPacket(new ExInzoneWaiting(activeChar)); + activeChar.sendPacket(new ExInzoneWaiting(activeChar, false)); return true; } } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestInzoneWaitingTime.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestInzoneWaitingTime.java index 42bdbbdcdd..3bb1e3d444 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestInzoneWaitingTime.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestInzoneWaitingTime.java @@ -40,6 +40,6 @@ public class RequestInzoneWaitingTime implements IClientIncomingPacket { return; } - client.sendPacket(new ExInzoneWaiting(activeChar)); + client.sendPacket(new ExInzoneWaiting(activeChar, true)); } } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java index d0e3eaf0e1..e56bfeecaa 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java @@ -33,12 +33,14 @@ public class ExInzoneWaiting implements IClientOutgoingPacket { private final int _currentTemplateId; private final Map _instanceTimes; + private final boolean _sendByClient; - public ExInzoneWaiting(L2PcInstance activeChar) + public ExInzoneWaiting(L2PcInstance activeChar, boolean sendByClient) { final Instance instance = InstanceManager.getInstance().getPlayerInstance(activeChar, false); _currentTemplateId = ((instance != null) && (instance.getTemplateId() >= 0)) ? instance.getTemplateId() : -1; _instanceTimes = InstanceManager.getInstance().getAllInstanceTimes(activeChar); + _sendByClient = sendByClient; } @Override @@ -46,7 +48,7 @@ public class ExInzoneWaiting implements IClientOutgoingPacket { OutgoingPackets.EX_INZONE_WAITING_INFO.writeId(packet); - packet.writeC(0x00); // identify if this is a response to a passive request + packet.writeC(_sendByClient ? 0x00 : 0x01); // Grand Crusade packet.writeD(_currentTemplateId); packet.writeD(_instanceTimes.size()); for (Entry entry : _instanceTimes.entrySet())