lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Proper instancezone panel visibility fix.

Browse Source
This commit is contained in:
MobiusDevelopment
2020-08-29 09:59:31 +00:00
parent 7c420db736
commit 89dbb63055
22 changed files with 99 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestInzoneWaitingTime.java
View File

@@ -22,13 +22,16 @@ import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.ExInzoneWaiting; import org.l2jmobius.gameserver.network.serverpackets.ExInzoneWaiting;
/** /**
* @author UnAfraid * @author Mobius
*/ */
public class RequestInzoneWaitingTime implements IClientIncomingPacket public class RequestInzoneWaitingTime implements IClientIncomingPacket
{ {
private boolean _hide;
@Override @Override
public boolean read(GameClient client, PacketReader packet) public boolean read(GameClient client, PacketReader packet)
{ {
_hide = packet.readC() == 0;
return true; return true;
} }
@@ -40,6 +43,6 @@ public class RequestInzoneWaitingTime implements IClientIncomingPacket
{ {
return; return;
} }
client.sendPacket(new ExInzoneWaiting(player, false)); client.sendPacket(new ExInzoneWaiting(player, _hide));
} }
} }

8
L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java
View File

@@ -33,14 +33,14 @@ public class ExInzoneWaiting implements IClientOutgoingPacket
{ {
private final int _currentTemplateId; private final int _currentTemplateId;
private final Map<Integer, Long> _instanceTimes; private final Map<Integer, Long> _instanceTimes;
private final boolean _sendByClient; private final boolean _hide;
public ExInzoneWaiting(PlayerInstance player, boolean sendByClient) public ExInzoneWaiting(PlayerInstance player, boolean hide)
{ {
final Instance instance = InstanceManager.getInstance().getPlayerInstance(player, false); final Instance instance = InstanceManager.getInstance().getPlayerInstance(player, false);
_currentTemplateId = ((instance != null) && (instance.getTemplateId() >= 0)) ? instance.getTemplateId() : -1; _currentTemplateId = ((instance != null) && (instance.getTemplateId() >= 0)) ? instance.getTemplateId() : -1;
_instanceTimes = InstanceManager.getInstance().getAllInstanceTimes(player); _instanceTimes = InstanceManager.getInstance().getAllInstanceTimes(player);
_sendByClient = sendByClient; _hide = hide;
} }
@Override @Override
@@ -48,7 +48,7 @@ public class ExInzoneWaiting implements IClientOutgoingPacket
{ {
OutgoingPackets.EX_INZONE_WAITING_INFO.writeId(packet); OutgoingPackets.EX_INZONE_WAITING_INFO.writeId(packet);
packet.writeC(_sendByClient ? 0x00 : 0x01); // Grand Crusade packet.writeC(_hide ? 0x00 : 0x01); // Grand Crusade
packet.writeD(_currentTemplateId); packet.writeD(_currentTemplateId);
packet.writeD(_instanceTimes.size()); packet.writeD(_instanceTimes.size());
for (Entry<Integer, Long> entry : _instanceTimes.entrySet()) for (Entry<Integer, Long> entry : _instanceTimes.entrySet())

7
L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestInzoneWaitingTime.java
View File

@@ -22,13 +22,16 @@ import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.ExInzoneWaiting; import org.l2jmobius.gameserver.network.serverpackets.ExInzoneWaiting;
/** /**
* @author UnAfraid * @author Mobius
*/ */
public class RequestInzoneWaitingTime implements IClientIncomingPacket public class RequestInzoneWaitingTime implements IClientIncomingPacket
{ {
private boolean _hide;
@Override @Override
public boolean read(GameClient client, PacketReader packet) public boolean read(GameClient client, PacketReader packet)
{ {
_hide = packet.readC() == 0;
return true; return true;
} }
@@ -40,6 +43,6 @@ public class RequestInzoneWaitingTime implements IClientIncomingPacket
{ {
return; return;
} }
client.sendPacket(new ExInzoneWaiting(player, false)); client.sendPacket(new ExInzoneWaiting(player, _hide));
} }
} }

8
L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java
View File

@@ -33,14 +33,14 @@ public class ExInzoneWaiting implements IClientOutgoingPacket
{ {
private final int _currentTemplateId; private final int _currentTemplateId;
private final Map<Integer, Long> _instanceTimes; private final Map<Integer, Long> _instanceTimes;
private final boolean _sendByClient; private final boolean _hide;
public ExInzoneWaiting(PlayerInstance player, boolean sendByClient) public ExInzoneWaiting(PlayerInstance player, boolean hide)
{ {
final Instance instance = InstanceManager.getInstance().getPlayerInstance(player, false); final Instance instance = InstanceManager.getInstance().getPlayerInstance(player, false);
_currentTemplateId = ((instance != null) && (instance.getTemplateId() >= 0)) ? instance.getTemplateId() : -1; _currentTemplateId = ((instance != null) && (instance.getTemplateId() >= 0)) ? instance.getTemplateId() : -1;
_instanceTimes = InstanceManager.getInstance().getAllInstanceTimes(player); _instanceTimes = InstanceManager.getInstance().getAllInstanceTimes(player);
_sendByClient = sendByClient; _hide = hide;
} }
@Override @Override
@@ -48,7 +48,7 @@ public class ExInzoneWaiting implements IClientOutgoingPacket
{ {
OutgoingPackets.EX_INZONE_WAITING_INFO.writeId(packet); OutgoingPackets.EX_INZONE_WAITING_INFO.writeId(packet);
packet.writeC(_sendByClient ? 0x00 : 0x01); // Grand Crusade packet.writeC(_hide ? 0x00 : 0x01); // Grand Crusade
packet.writeD(_currentTemplateId); packet.writeD(_currentTemplateId);
packet.writeD(_instanceTimes.size()); packet.writeD(_instanceTimes.size());
for (Entry<Integer, Long> entry : _instanceTimes.entrySet()) for (Entry<Integer, Long> entry : _instanceTimes.entrySet())

7
L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestInzoneWaitingTime.java
View File

@@ -22,13 +22,16 @@ import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.ExInzoneWaiting; import org.l2jmobius.gameserver.network.serverpackets.ExInzoneWaiting;
/** /**
* @author UnAfraid * @author Mobius
*/ */
public class RequestInzoneWaitingTime implements IClientIncomingPacket public class RequestInzoneWaitingTime implements IClientIncomingPacket
{ {
private boolean _hide;
@Override @Override
public boolean read(GameClient client, PacketReader packet) public boolean read(GameClient client, PacketReader packet)
{ {
_hide = packet.readC() == 0;
return true; return true;
} }
@@ -40,6 +43,6 @@ public class RequestInzoneWaitingTime implements IClientIncomingPacket
{ {
return; return;
} }
client.sendPacket(new ExInzoneWaiting(player, false)); client.sendPacket(new ExInzoneWaiting(player, _hide));
} }
} }

8
L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java
View File

@@ -33,14 +33,14 @@ public class ExInzoneWaiting implements IClientOutgoingPacket
{ {
private final int _currentTemplateId; private final int _currentTemplateId;
private final Map<Integer, Long> _instanceTimes; private final Map<Integer, Long> _instanceTimes;
private final boolean _sendByClient; private final boolean _hide;
public ExInzoneWaiting(PlayerInstance player, boolean sendByClient) public ExInzoneWaiting(PlayerInstance player, boolean hide)
{ {
final Instance instance = InstanceManager.getInstance().getPlayerInstance(player, false); final Instance instance = InstanceManager.getInstance().getPlayerInstance(player, false);
_currentTemplateId = ((instance != null) && (instance.getTemplateId() >= 0)) ? instance.getTemplateId() : -1; _currentTemplateId = ((instance != null) && (instance.getTemplateId() >= 0)) ? instance.getTemplateId() : -1;
_instanceTimes = InstanceManager.getInstance().getAllInstanceTimes(player); _instanceTimes = InstanceManager.getInstance().getAllInstanceTimes(player);
_sendByClient = sendByClient; _hide = hide;
} }
@Override @Override
@@ -48,7 +48,7 @@ public class ExInzoneWaiting implements IClientOutgoingPacket
{ {
OutgoingPackets.EX_INZONE_WAITING_INFO.writeId(packet); OutgoingPackets.EX_INZONE_WAITING_INFO.writeId(packet);
packet.writeC(_sendByClient ? 0x00 : 0x01); // Grand Crusade packet.writeC(_hide ? 0x00 : 0x01); // Grand Crusade
packet.writeD(_currentTemplateId); packet.writeD(_currentTemplateId);
packet.writeD(_instanceTimes.size()); packet.writeD(_instanceTimes.size());
for (Entry<Integer, Long> entry : _instanceTimes.entrySet()) for (Entry<Integer, Long> entry : _instanceTimes.entrySet())

7
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestInzoneWaitingTime.java
View File

@@ -22,13 +22,16 @@ import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.ExInzoneWaiting; import org.l2jmobius.gameserver.network.serverpackets.ExInzoneWaiting;
/** /**
* @author UnAfraid * @author Mobius
*/ */
public class RequestInzoneWaitingTime implements IClientIncomingPacket public class RequestInzoneWaitingTime implements IClientIncomingPacket
{ {
private boolean _hide;
@Override @Override
public boolean read(GameClient client, PacketReader packet) public boolean read(GameClient client, PacketReader packet)
{ {
_hide = packet.readC() == 0;
return true; return true;
} }
@@ -40,6 +43,6 @@ public class RequestInzoneWaitingTime implements IClientIncomingPacket
{ {
return; return;
} }
client.sendPacket(new ExInzoneWaiting(player, false)); client.sendPacket(new ExInzoneWaiting(player, _hide));
} }
} }

8
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java
View File

@@ -33,14 +33,14 @@ public class ExInzoneWaiting implements IClientOutgoingPacket
{ {
private final int _currentTemplateId; private final int _currentTemplateId;
private final Map<Integer, Long> _instanceTimes; private final Map<Integer, Long> _instanceTimes;
private final boolean _sendByClient; private final boolean _hide;
public ExInzoneWaiting(PlayerInstance player, boolean sendByClient) public ExInzoneWaiting(PlayerInstance player, boolean hide)
{ {
final Instance instance = InstanceManager.getInstance().getPlayerInstance(player, false); final Instance instance = InstanceManager.getInstance().getPlayerInstance(player, false);
_currentTemplateId = ((instance != null) && (instance.getTemplateId() >= 0)) ? instance.getTemplateId() : -1; _currentTemplateId = ((instance != null) && (instance.getTemplateId() >= 0)) ? instance.getTemplateId() : -1;
_instanceTimes = InstanceManager.getInstance().getAllInstanceTimes(player); _instanceTimes = InstanceManager.getInstance().getAllInstanceTimes(player);
_sendByClient = sendByClient; _hide = hide;
} }
@Override @Override
@@ -48,7 +48,7 @@ public class ExInzoneWaiting implements IClientOutgoingPacket
{ {
OutgoingPackets.EX_INZONE_WAITING_INFO.writeId(packet); OutgoingPackets.EX_INZONE_WAITING_INFO.writeId(packet);
packet.writeC(_sendByClient ? 0x00 : 0x01); // Grand Crusade packet.writeC(_hide ? 0x00 : 0x01); // Grand Crusade
packet.writeD(_currentTemplateId); packet.writeD(_currentTemplateId);
packet.writeD(_instanceTimes.size()); packet.writeD(_instanceTimes.size());
for (Entry<Integer, Long> entry : _instanceTimes.entrySet()) for (Entry<Integer, Long> entry : _instanceTimes.entrySet())

7
L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestInzoneWaitingTime.java
View File

@@ -22,13 +22,16 @@ import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.ExInzoneWaiting; import org.l2jmobius.gameserver.network.serverpackets.ExInzoneWaiting;
/** /**
* @author UnAfraid * @author Mobius
*/ */
public class RequestInzoneWaitingTime implements IClientIncomingPacket public class RequestInzoneWaitingTime implements IClientIncomingPacket
{ {
private boolean _hide;
@Override @Override
public boolean read(GameClient client, PacketReader packet) public boolean read(GameClient client, PacketReader packet)
{ {
_hide = packet.readC() == 0;
return true; return true;
} }
@@ -40,6 +43,6 @@ public class RequestInzoneWaitingTime implements IClientIncomingPacket
{ {
return; return;
} }
client.sendPacket(new ExInzoneWaiting(player, false)); client.sendPacket(new ExInzoneWaiting(player, _hide));
} }
} }

8
L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java
View File

@@ -33,14 +33,14 @@ public class ExInzoneWaiting implements IClientOutgoingPacket
{ {
private final int _currentTemplateId; private final int _currentTemplateId;
private final Map<Integer, Long> _instanceTimes; private final Map<Integer, Long> _instanceTimes;
private final boolean _sendByClient; private final boolean _hide;
public ExInzoneWaiting(PlayerInstance player, boolean sendByClient) public ExInzoneWaiting(PlayerInstance player, boolean hide)
{ {
final Instance instance = InstanceManager.getInstance().getPlayerInstance(player, false); final Instance instance = InstanceManager.getInstance().getPlayerInstance(player, false);
_currentTemplateId = ((instance != null) && (instance.getTemplateId() >= 0)) ? instance.getTemplateId() : -1; _currentTemplateId = ((instance != null) && (instance.getTemplateId() >= 0)) ? instance.getTemplateId() : -1;
_instanceTimes = InstanceManager.getInstance().getAllInstanceTimes(player); _instanceTimes = InstanceManager.getInstance().getAllInstanceTimes(player);
_sendByClient = sendByClient; _hide = hide;
} }
@Override @Override
@@ -48,7 +48,7 @@ public class ExInzoneWaiting implements IClientOutgoingPacket
{ {
OutgoingPackets.EX_INZONE_WAITING_INFO.writeId(packet); OutgoingPackets.EX_INZONE_WAITING_INFO.writeId(packet);
packet.writeC(_sendByClient ? 0x00 : 0x01); // Grand Crusade packet.writeC(_hide ? 0x00 : 0x01); // Grand Crusade
packet.writeD(_currentTemplateId); packet.writeD(_currentTemplateId);
packet.writeD(_instanceTimes.size()); packet.writeD(_instanceTimes.size());
for (Entry<Integer, Long> entry : _instanceTimes.entrySet()) for (Entry<Integer, Long> entry : _instanceTimes.entrySet())

7
L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestInzoneWaitingTime.java
View File

@@ -22,13 +22,16 @@ import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.ExInzoneWaiting; import org.l2jmobius.gameserver.network.serverpackets.ExInzoneWaiting;
/** /**
* @author UnAfraid * @author Mobius
*/ */
public class RequestInzoneWaitingTime implements IClientIncomingPacket public class RequestInzoneWaitingTime implements IClientIncomingPacket
{ {
private boolean _hide;
@Override @Override
public boolean read(GameClient client, PacketReader packet) public boolean read(GameClient client, PacketReader packet)
{ {
_hide = packet.readC() == 0;
return true; return true;
} }
@@ -40,6 +43,6 @@ public class RequestInzoneWaitingTime implements IClientIncomingPacket
{ {
return; return;
} }
client.sendPacket(new ExInzoneWaiting(player, false)); client.sendPacket(new ExInzoneWaiting(player, _hide));
} }
} }

8
L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java
View File

@@ -33,14 +33,14 @@ public class ExInzoneWaiting implements IClientOutgoingPacket
{ {
private final int _currentTemplateId; private final int _currentTemplateId;
private final Map<Integer, Long> _instanceTimes; private final Map<Integer, Long> _instanceTimes;
private final boolean _sendByClient; private final boolean _hide;
public ExInzoneWaiting(PlayerInstance player, boolean sendByClient) public ExInzoneWaiting(PlayerInstance player, boolean hide)
{ {
final Instance instance = InstanceManager.getInstance().getPlayerInstance(player, false); final Instance instance = InstanceManager.getInstance().getPlayerInstance(player, false);
_currentTemplateId = ((instance != null) && (instance.getTemplateId() >= 0)) ? instance.getTemplateId() : -1; _currentTemplateId = ((instance != null) && (instance.getTemplateId() >= 0)) ? instance.getTemplateId() : -1;
_instanceTimes = InstanceManager.getInstance().getAllInstanceTimes(player); _instanceTimes = InstanceManager.getInstance().getAllInstanceTimes(player);
_sendByClient = sendByClient; _hide = hide;
} }
@Override @Override
@@ -48,7 +48,7 @@ public class ExInzoneWaiting implements IClientOutgoingPacket
{ {
OutgoingPackets.EX_INZONE_WAITING_INFO.writeId(packet); OutgoingPackets.EX_INZONE_WAITING_INFO.writeId(packet);
packet.writeC(_sendByClient ? 0x00 : 0x01); // Grand Crusade packet.writeC(_hide ? 0x00 : 0x01); // Grand Crusade
packet.writeD(_currentTemplateId); packet.writeD(_currentTemplateId);
packet.writeD(_instanceTimes.size()); packet.writeD(_instanceTimes.size());
for (Entry<Integer, Long> entry : _instanceTimes.entrySet()) for (Entry<Integer, Long> entry : _instanceTimes.entrySet())

7
L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestInzoneWaitingTime.java
View File

@@ -22,13 +22,16 @@ import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.ExInzoneWaiting; import org.l2jmobius.gameserver.network.serverpackets.ExInzoneWaiting;
/** /**
* @author UnAfraid * @author Mobius
*/ */
public class RequestInzoneWaitingTime implements IClientIncomingPacket public class RequestInzoneWaitingTime implements IClientIncomingPacket
{ {
private boolean _hide;
@Override @Override
public boolean read(GameClient client, PacketReader packet) public boolean read(GameClient client, PacketReader packet)
{ {
_hide = packet.readC() == 0;
return true; return true;
} }
@@ -40,6 +43,6 @@ public class RequestInzoneWaitingTime implements IClientIncomingPacket
{ {
return; return;
} }
client.sendPacket(new ExInzoneWaiting(player, false)); client.sendPacket(new ExInzoneWaiting(player, _hide));
} }
} }

8
L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java
View File

@@ -33,14 +33,14 @@ public class ExInzoneWaiting implements IClientOutgoingPacket
{ {
private final int _currentTemplateId; private final int _currentTemplateId;
private final Map<Integer, Long> _instanceTimes; private final Map<Integer, Long> _instanceTimes;
private final boolean _sendByClient; private final boolean _hide;
public ExInzoneWaiting(PlayerInstance player, boolean sendByClient) public ExInzoneWaiting(PlayerInstance player, boolean hide)
{ {
final Instance instance = InstanceManager.getInstance().getPlayerInstance(player, false); final Instance instance = InstanceManager.getInstance().getPlayerInstance(player, false);
_currentTemplateId = ((instance != null) && (instance.getTemplateId() >= 0)) ? instance.getTemplateId() : -1; _currentTemplateId = ((instance != null) && (instance.getTemplateId() >= 0)) ? instance.getTemplateId() : -1;
_instanceTimes = InstanceManager.getInstance().getAllInstanceTimes(player); _instanceTimes = InstanceManager.getInstance().getAllInstanceTimes(player);
_sendByClient = sendByClient; _hide = hide;
} }
@Override @Override
@@ -48,7 +48,7 @@ public class ExInzoneWaiting implements IClientOutgoingPacket
{ {
OutgoingPackets.EX_INZONE_WAITING_INFO.writeId(packet); OutgoingPackets.EX_INZONE_WAITING_INFO.writeId(packet);
packet.writeC(_sendByClient ? 0x00 : 0x01); // Grand Crusade packet.writeC(_hide ? 0x00 : 0x01); // Grand Crusade
packet.writeD(_currentTemplateId); packet.writeD(_currentTemplateId);
packet.writeD(_instanceTimes.size()); packet.writeD(_instanceTimes.size());
for (Entry<Integer, Long> entry : _instanceTimes.entrySet()) for (Entry<Integer, Long> entry : _instanceTimes.entrySet())

7
L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestInzoneWaitingTime.java
View File

@@ -22,13 +22,16 @@ import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.ExInzoneWaiting; import org.l2jmobius.gameserver.network.serverpackets.ExInzoneWaiting;
/** /**
* @author UnAfraid * @author Mobius
*/ */
public class RequestInzoneWaitingTime implements IClientIncomingPacket public class RequestInzoneWaitingTime implements IClientIncomingPacket
{ {
private boolean _hide;
@Override @Override
public boolean read(GameClient client, PacketReader packet) public boolean read(GameClient client, PacketReader packet)
{ {
_hide = packet.readC() == 0;
return true; return true;
} }
@@ -40,6 +43,6 @@ public class RequestInzoneWaitingTime implements IClientIncomingPacket
{ {
return; return;
} }
client.sendPacket(new ExInzoneWaiting(player, false)); client.sendPacket(new ExInzoneWaiting(player, _hide));
} }
} }

8
L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java
View File

@@ -33,14 +33,14 @@ public class ExInzoneWaiting implements IClientOutgoingPacket
{ {
private final int _currentTemplateId; private final int _currentTemplateId;
private final Map<Integer, Long> _instanceTimes; private final Map<Integer, Long> _instanceTimes;
private final boolean _sendByClient; private final boolean _hide;
public ExInzoneWaiting(PlayerInstance player, boolean sendByClient) public ExInzoneWaiting(PlayerInstance player, boolean hide)
{ {
final Instance instance = InstanceManager.getInstance().getPlayerInstance(player, false); final Instance instance = InstanceManager.getInstance().getPlayerInstance(player, false);
_currentTemplateId = ((instance != null) && (instance.getTemplateId() >= 0)) ? instance.getTemplateId() : -1; _currentTemplateId = ((instance != null) && (instance.getTemplateId() >= 0)) ? instance.getTemplateId() : -1;
_instanceTimes = InstanceManager.getInstance().getAllInstanceTimes(player); _instanceTimes = InstanceManager.getInstance().getAllInstanceTimes(player);
_sendByClient = sendByClient; _hide = hide;
} }
@Override @Override
@@ -48,7 +48,7 @@ public class ExInzoneWaiting implements IClientOutgoingPacket
{ {
OutgoingPackets.EX_INZONE_WAITING_INFO.writeId(packet); OutgoingPackets.EX_INZONE_WAITING_INFO.writeId(packet);
packet.writeC(_sendByClient ? 0x00 : 0x01); // Grand Crusade packet.writeC(_hide ? 0x00 : 0x01); // Grand Crusade
packet.writeD(_currentTemplateId); packet.writeD(_currentTemplateId);
packet.writeD(_instanceTimes.size()); packet.writeD(_instanceTimes.size());
for (Entry<Integer, Long> entry : _instanceTimes.entrySet()) for (Entry<Integer, Long> entry : _instanceTimes.entrySet())

7
L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestInzoneWaitingTime.java
View File

@@ -22,13 +22,16 @@ import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.ExInzoneWaiting; import org.l2jmobius.gameserver.network.serverpackets.ExInzoneWaiting;
/** /**
* @author UnAfraid * @author Mobius
*/ */
public class RequestInzoneWaitingTime implements IClientIncomingPacket public class RequestInzoneWaitingTime implements IClientIncomingPacket
{ {
private boolean _hide;
@Override @Override
public boolean read(GameClient client, PacketReader packet) public boolean read(GameClient client, PacketReader packet)
{ {
_hide = packet.readC() == 0;
return true; return true;
} }
@@ -40,6 +43,6 @@ public class RequestInzoneWaitingTime implements IClientIncomingPacket
{ {
return; return;
} }
client.sendPacket(new ExInzoneWaiting(player, false)); client.sendPacket(new ExInzoneWaiting(player, _hide));
} }
} }

8
L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java
View File

@@ -33,14 +33,14 @@ public class ExInzoneWaiting implements IClientOutgoingPacket
{ {
private final int _currentTemplateId; private final int _currentTemplateId;
private final Map<Integer, Long> _instanceTimes; private final Map<Integer, Long> _instanceTimes;
private final boolean _sendByClient; private final boolean _hide;
public ExInzoneWaiting(PlayerInstance player, boolean sendByClient) public ExInzoneWaiting(PlayerInstance player, boolean hide)
{ {
final Instance instance = InstanceManager.getInstance().getPlayerInstance(player, false); final Instance instance = InstanceManager.getInstance().getPlayerInstance(player, false);
_currentTemplateId = ((instance != null) && (instance.getTemplateId() >= 0)) ? instance.getTemplateId() : -1; _currentTemplateId = ((instance != null) && (instance.getTemplateId() >= 0)) ? instance.getTemplateId() : -1;
_instanceTimes = InstanceManager.getInstance().getAllInstanceTimes(player); _instanceTimes = InstanceManager.getInstance().getAllInstanceTimes(player);
_sendByClient = sendByClient; _hide = hide;
} }
@Override @Override
@@ -48,7 +48,7 @@ public class ExInzoneWaiting implements IClientOutgoingPacket
{ {
OutgoingPackets.EX_INZONE_WAITING_INFO.writeId(packet); OutgoingPackets.EX_INZONE_WAITING_INFO.writeId(packet);
packet.writeC(_sendByClient ? 0x00 : 0x01); // Grand Crusade packet.writeC(_hide ? 0x00 : 0x01); // Grand Crusade
packet.writeD(_currentTemplateId); packet.writeD(_currentTemplateId);
packet.writeD(_instanceTimes.size()); packet.writeD(_instanceTimes.size());
for (Entry<Integer, Long> entry : _instanceTimes.entrySet()) for (Entry<Integer, Long> entry : _instanceTimes.entrySet())

7
L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestInzoneWaitingTime.java
View File

@@ -22,13 +22,16 @@ import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.ExInzoneWaiting; import org.l2jmobius.gameserver.network.serverpackets.ExInzoneWaiting;
/** /**
* @author UnAfraid * @author Mobius
*/ */
public class RequestInzoneWaitingTime implements IClientIncomingPacket public class RequestInzoneWaitingTime implements IClientIncomingPacket
{ {
private boolean _hide;
@Override @Override
public boolean read(GameClient client, PacketReader packet) public boolean read(GameClient client, PacketReader packet)
{ {
_hide = packet.readC() == 0;
return true; return true;
} }
@@ -40,6 +43,6 @@ public class RequestInzoneWaitingTime implements IClientIncomingPacket
{ {
return; return;
} }
client.sendPacket(new ExInzoneWaiting(player, false)); client.sendPacket(new ExInzoneWaiting(player, _hide));
} }
} }

8
L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java
View File

@@ -33,14 +33,14 @@ public class ExInzoneWaiting implements IClientOutgoingPacket
{ {
private final int _currentTemplateId; private final int _currentTemplateId;
private final Map<Integer, Long> _instanceTimes; private final Map<Integer, Long> _instanceTimes;
private final boolean _sendByClient; private final boolean _hide;
public ExInzoneWaiting(PlayerInstance player, boolean sendByClient) public ExInzoneWaiting(PlayerInstance player, boolean hide)
{ {
final Instance instance = InstanceManager.getInstance().getPlayerInstance(player, false); final Instance instance = InstanceManager.getInstance().getPlayerInstance(player, false);
_currentTemplateId = ((instance != null) && (instance.getTemplateId() >= 0)) ? instance.getTemplateId() : -1; _currentTemplateId = ((instance != null) && (instance.getTemplateId() >= 0)) ? instance.getTemplateId() : -1;
_instanceTimes = InstanceManager.getInstance().getAllInstanceTimes(player); _instanceTimes = InstanceManager.getInstance().getAllInstanceTimes(player);
_sendByClient = sendByClient; _hide = hide;
} }
@Override @Override
@@ -48,7 +48,7 @@ public class ExInzoneWaiting implements IClientOutgoingPacket
{ {
OutgoingPackets.EX_INZONE_WAITING_INFO.writeId(packet); OutgoingPackets.EX_INZONE_WAITING_INFO.writeId(packet);
packet.writeC(_sendByClient ? 0x00 : 0x01); // Grand Crusade packet.writeC(_hide ? 0x00 : 0x01); // Grand Crusade
packet.writeD(_currentTemplateId); packet.writeD(_currentTemplateId);
packet.writeD(_instanceTimes.size()); packet.writeD(_instanceTimes.size());
for (Entry<Integer, Long> entry : _instanceTimes.entrySet()) for (Entry<Integer, Long> entry : _instanceTimes.entrySet())

7
L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestInzoneWaitingTime.java
View File

@@ -22,13 +22,16 @@ import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.ExInzoneWaiting; import org.l2jmobius.gameserver.network.serverpackets.ExInzoneWaiting;
/** /**
* @author UnAfraid * @author Mobius
*/ */
public class RequestInzoneWaitingTime implements IClientIncomingPacket public class RequestInzoneWaitingTime implements IClientIncomingPacket
{ {
private boolean _hide;
@Override @Override
public boolean read(GameClient client, PacketReader packet) public boolean read(GameClient client, PacketReader packet)
{ {
_hide = packet.readC() == 0;
return true; return true;
} }
@@ -40,6 +43,6 @@ public class RequestInzoneWaitingTime implements IClientIncomingPacket
{ {
return; return;
} }
client.sendPacket(new ExInzoneWaiting(player, false)); client.sendPacket(new ExInzoneWaiting(player, _hide));
} }
} }

8
L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java
View File

@@ -33,14 +33,14 @@ public class ExInzoneWaiting implements IClientOutgoingPacket
{ {
private final int _currentTemplateId; private final int _currentTemplateId;
private final Map<Integer, Long> _instanceTimes; private final Map<Integer, Long> _instanceTimes;
private final boolean _sendByClient; private final boolean _hide;
public ExInzoneWaiting(PlayerInstance player, boolean sendByClient) public ExInzoneWaiting(PlayerInstance player, boolean hide)
{ {
final Instance instance = InstanceManager.getInstance().getPlayerInstance(player, false); final Instance instance = InstanceManager.getInstance().getPlayerInstance(player, false);
_currentTemplateId = ((instance != null) && (instance.getTemplateId() >= 0)) ? instance.getTemplateId() : -1; _currentTemplateId = ((instance != null) && (instance.getTemplateId() >= 0)) ? instance.getTemplateId() : -1;
_instanceTimes = InstanceManager.getInstance().getAllInstanceTimes(player); _instanceTimes = InstanceManager.getInstance().getAllInstanceTimes(player);
_sendByClient = sendByClient; _hide = hide;
} }
@Override @Override
@@ -48,7 +48,7 @@ public class ExInzoneWaiting implements IClientOutgoingPacket
{ {
OutgoingPackets.EX_INZONE_WAITING_INFO.writeId(packet); OutgoingPackets.EX_INZONE_WAITING_INFO.writeId(packet);
packet.writeC(_sendByClient ? 0x00 : 0x01); // Grand Crusade packet.writeC(_hide ? 0x00 : 0x01); // Grand Crusade
packet.writeD(_currentTemplateId); packet.writeD(_currentTemplateId);
packet.writeD(_instanceTimes.size()); packet.writeD(_instanceTimes.size());
for (Entry<Integer, Long> entry : _instanceTimes.entrySet()) for (Entry<Integer, Long> entry : _instanceTimes.entrySet())