From 91936e27871f69973a1509f190dc4a11b59c475c Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Wed, 6 Nov 2019 19:44:10 +0000 Subject: [PATCH] Addition of client protocol version at character info menu. --- .../dist/game/data/html/admin/charinfo.htm | 3 +++ .../admincommandhandlers/AdminEditChar.java | 1 + .../gameserver/network/GameClient.java | 18 +++++++++++++++--- .../network/clientpackets/ProtocolVersion.java | 1 + .../dist/game/data/html/admin/charinfo.htm | 3 +++ .../admincommandhandlers/AdminEditChar.java | 1 + .../gameserver/network/GameClient.java | 18 +++++++++++++++--- .../network/clientpackets/ProtocolVersion.java | 1 + .../dist/game/data/html/admin/charinfo.htm | 3 +++ .../admincommandhandlers/AdminEditChar.java | 1 + .../gameserver/network/GameClient.java | 18 +++++++++++++++--- .../network/clientpackets/ProtocolVersion.java | 1 + .../dist/game/data/html/admin/charinfo.htm | 3 +++ .../admincommandhandlers/AdminEditChar.java | 1 + .../gameserver/network/GameClient.java | 18 +++++++++++++++--- .../network/clientpackets/ProtocolVersion.java | 1 + .../dist/game/data/html/admin/charinfo.htm | 3 +++ .../admincommandhandlers/AdminEditChar.java | 1 + .../gameserver/network/GameClient.java | 18 +++++++++++++++--- .../network/clientpackets/ProtocolVersion.java | 1 + .../dist/game/data/html/admin/charinfo.htm | 3 +++ .../admincommandhandlers/AdminEditChar.java | 1 + .../gameserver/network/GameClient.java | 18 +++++++++++++++--- .../network/clientpackets/ProtocolVersion.java | 1 + .../dist/game/data/html/admin/charinfo.htm | 3 +++ .../admincommandhandlers/AdminEditChar.java | 1 + .../gameserver/network/GameClient.java | 18 +++++++++++++++--- .../network/clientpackets/ProtocolVersion.java | 1 + .../dist/game/data/html/admin/charinfo.htm | 3 +++ .../admincommandhandlers/AdminEditChar.java | 1 + .../gameserver/network/GameClient.java | 18 +++++++++++++++--- .../network/clientpackets/ProtocolVersion.java | 1 + .../dist/game/data/html/admin/charinfo.htm | 8 ++++---- .../admincommandhandlers/AdminEditChar.java | 1 + .../gameserver/network/GameClient.java | 12 ++++++++++++ .../network/clientpackets/ProtocolVersion.java | 1 + .../dist/game/data/html/admin/charinfo.htm | 9 ++++++--- .../admincommandhandlers/AdminEditChar.java | 1 + .../gameserver/network/GameClient.java | 18 +++++++++++++++--- .../network/clientpackets/ProtocolVersion.java | 1 + .../dist/game/data/html/admin/charinfo.htm | 9 ++++++--- .../admincommandhandlers/AdminEditChar.java | 1 + .../gameserver/network/GameClient.java | 18 +++++++++++++++--- .../network/clientpackets/ProtocolVersion.java | 1 + .../dist/game/data/html/admin/charinfo.htm | 3 +++ .../admincommandhandlers/AdminEditChar.java | 1 + .../gameserver/network/GameClient.java | 18 +++++++++++++++--- .../network/clientpackets/ProtocolVersion.java | 1 + .../dist/game/data/html/admin/charinfo.htm | 3 +++ .../admincommandhandlers/AdminEditChar.java | 1 + .../gameserver/network/GameClient.java | 18 +++++++++++++++--- .../network/clientpackets/ProtocolVersion.java | 1 + .../dist/game/data/html/admin/charinfo.htm | 3 +++ .../admincommandhandlers/AdminEditChar.java | 1 + .../gameserver/network/GameClient.java | 18 +++++++++++++++--- .../network/clientpackets/ProtocolVersion.java | 1 + .../dist/game/data/html/admin/charinfo.htm | 3 +++ .../admincommandhandlers/AdminEditChar.java | 1 + .../gameserver/network/GameClient.java | 18 +++++++++++++++--- .../network/clientpackets/ProtocolVersion.java | 1 + .../dist/game/data/html/admin/charinfo.htm | 3 +++ .../admincommandhandlers/AdminEditChar.java | 1 + .../gameserver/network/GameClient.java | 18 +++++++++++++++--- .../network/clientpackets/ProtocolVersion.java | 1 + .../dist/game/data/html/admin/charinfo.htm | 3 +++ .../admincommandhandlers/AdminEditChar.java | 1 + .../gameserver/network/GameClient.java | 18 +++++++++++++++--- .../network/clientpackets/ProtocolVersion.java | 1 + .../dist/game/data/html/admin/charinfo.htm | 3 +++ .../admincommandhandlers/AdminEditChar.java | 1 + .../gameserver/network/GameClient.java | 18 +++++++++++++++--- .../network/clientpackets/ProtocolVersion.java | 1 + 72 files changed, 364 insertions(+), 61 deletions(-) diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/html/admin/charinfo.htm b/L2J_Mobius_1.0_Ertheia/dist/game/data/html/admin/charinfo.htm index e2159069b2..7f57c46e95 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/html/admin/charinfo.htm +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/html/admin/charinfo.htm @@ -40,6 +40,9 @@ Punishment: Info + +Client Protocol: %protocol% +

diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java index 63c8979743..3dc670cc49 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java @@ -1180,6 +1180,7 @@ public class AdminEditChar implements IAdminCommandHandler adminReply.replace("%access%", player.getAccessLevel().getLevel() + " (" + player.getAccessLevel().getName() + ")"); adminReply.replace("%account%", player.getAccountName()); adminReply.replace("%ip%", ip); + adminReply.replace("%protocol%", String.valueOf(player.getClient() != null ? player.getClient().getProtocolVersion() : "NULL")); adminReply.replace("%hwid%", (player.getClient() != null) && (player.getClient().getHardwareInfo() != null) ? player.getClient().getHardwareInfo().getMacAddress() : "Unknown"); adminReply.replace("%ai%", player.getAI().getIntention().name()); adminReply.replace("%inst%", player.isInInstance() ? "InstanceId:" + player.getInstanceId() + "" : ""); diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/GameClient.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/GameClient.java index eedfeb53e8..adc47ac7a0 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/GameClient.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/GameClient.java @@ -87,7 +87,9 @@ public class GameClient extends ChannelInboundHandler private volatile boolean _isDetached = false; - private boolean _protocol; + private int _protocolVersion; + + private boolean _protocolOk; private int[][] trace; @@ -650,14 +652,24 @@ public class GameClient extends ChannelInboundHandler } } + public void setProtocolVersion(int version) + { + _protocolVersion = version; + } + + public int getProtocolVersion() + { + return _protocolVersion; + } + public boolean isProtocolOk() { - return _protocol; + return _protocolOk; } public void setProtocolOk(boolean b) { - _protocol = b; + _protocolOk = b; } public void setClientTracert(int[][] tracert) diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java index 1c76ea39e0..1d83a63131 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java @@ -57,6 +57,7 @@ public class ProtocolVersion implements IClientIncomingPacket else { client.sendPacket(new KeyPacket(client.enableCrypt(), 1)); + client.setProtocolVersion(_version); client.setProtocolOk(true); } } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/html/admin/charinfo.htm b/L2J_Mobius_2.5_Underground/dist/game/data/html/admin/charinfo.htm index e2159069b2..7f57c46e95 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/html/admin/charinfo.htm +++ b/L2J_Mobius_2.5_Underground/dist/game/data/html/admin/charinfo.htm @@ -40,6 +40,9 @@ Punishment: Info + +Client Protocol: %protocol% +

diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java index bd37d544e6..e5226343c8 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java @@ -1199,6 +1199,7 @@ public class AdminEditChar implements IAdminCommandHandler adminReply.replace("%access%", player.getAccessLevel().getLevel() + " (" + player.getAccessLevel().getName() + ")"); adminReply.replace("%account%", player.getAccountName()); adminReply.replace("%ip%", ip); + adminReply.replace("%protocol%", String.valueOf(player.getClient() != null ? player.getClient().getProtocolVersion() : "NULL")); adminReply.replace("%hwid%", (player.getClient() != null) && (player.getClient().getHardwareInfo() != null) ? player.getClient().getHardwareInfo().getMacAddress() : "Unknown"); adminReply.replace("%ai%", player.getAI().getIntention().name()); adminReply.replace("%inst%", player.isInInstance() ? "InstanceId:" + player.getInstanceId() + "" : ""); diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/GameClient.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/GameClient.java index eedfeb53e8..adc47ac7a0 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/GameClient.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/GameClient.java @@ -87,7 +87,9 @@ public class GameClient extends ChannelInboundHandler private volatile boolean _isDetached = false; - private boolean _protocol; + private int _protocolVersion; + + private boolean _protocolOk; private int[][] trace; @@ -650,14 +652,24 @@ public class GameClient extends ChannelInboundHandler } } + public void setProtocolVersion(int version) + { + _protocolVersion = version; + } + + public int getProtocolVersion() + { + return _protocolVersion; + } + public boolean isProtocolOk() { - return _protocol; + return _protocolOk; } public void setProtocolOk(boolean b) { - _protocol = b; + _protocolOk = b; } public void setClientTracert(int[][] tracert) diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java index 1c76ea39e0..1d83a63131 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java @@ -57,6 +57,7 @@ public class ProtocolVersion implements IClientIncomingPacket else { client.sendPacket(new KeyPacket(client.enableCrypt(), 1)); + client.setProtocolVersion(_version); client.setProtocolOk(true); } } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/html/admin/charinfo.htm b/L2J_Mobius_3.0_Helios/dist/game/data/html/admin/charinfo.htm index e2159069b2..7f57c46e95 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/html/admin/charinfo.htm +++ b/L2J_Mobius_3.0_Helios/dist/game/data/html/admin/charinfo.htm @@ -40,6 +40,9 @@ Punishment: Info + +Client Protocol: %protocol% +

diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java index bd37d544e6..e5226343c8 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java @@ -1199,6 +1199,7 @@ public class AdminEditChar implements IAdminCommandHandler adminReply.replace("%access%", player.getAccessLevel().getLevel() + " (" + player.getAccessLevel().getName() + ")"); adminReply.replace("%account%", player.getAccountName()); adminReply.replace("%ip%", ip); + adminReply.replace("%protocol%", String.valueOf(player.getClient() != null ? player.getClient().getProtocolVersion() : "NULL")); adminReply.replace("%hwid%", (player.getClient() != null) && (player.getClient().getHardwareInfo() != null) ? player.getClient().getHardwareInfo().getMacAddress() : "Unknown"); adminReply.replace("%ai%", player.getAI().getIntention().name()); adminReply.replace("%inst%", player.isInInstance() ? "InstanceId:" + player.getInstanceId() + "" : ""); diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/GameClient.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/GameClient.java index eedfeb53e8..adc47ac7a0 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/GameClient.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/GameClient.java @@ -87,7 +87,9 @@ public class GameClient extends ChannelInboundHandler private volatile boolean _isDetached = false; - private boolean _protocol; + private int _protocolVersion; + + private boolean _protocolOk; private int[][] trace; @@ -650,14 +652,24 @@ public class GameClient extends ChannelInboundHandler } } + public void setProtocolVersion(int version) + { + _protocolVersion = version; + } + + public int getProtocolVersion() + { + return _protocolVersion; + } + public boolean isProtocolOk() { - return _protocol; + return _protocolOk; } public void setProtocolOk(boolean b) { - _protocol = b; + _protocolOk = b; } public void setClientTracert(int[][] tracert) diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java index 1c76ea39e0..1d83a63131 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java @@ -57,6 +57,7 @@ public class ProtocolVersion implements IClientIncomingPacket else { client.sendPacket(new KeyPacket(client.enableCrypt(), 1)); + client.setProtocolVersion(_version); client.setProtocolOk(true); } } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/html/admin/charinfo.htm b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/html/admin/charinfo.htm index e2159069b2..7f57c46e95 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/html/admin/charinfo.htm +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/html/admin/charinfo.htm @@ -40,6 +40,9 @@ Punishment: Info + +Client Protocol: %protocol% +

diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java index bd37d544e6..e5226343c8 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java @@ -1199,6 +1199,7 @@ public class AdminEditChar implements IAdminCommandHandler adminReply.replace("%access%", player.getAccessLevel().getLevel() + " (" + player.getAccessLevel().getName() + ")"); adminReply.replace("%account%", player.getAccountName()); adminReply.replace("%ip%", ip); + adminReply.replace("%protocol%", String.valueOf(player.getClient() != null ? player.getClient().getProtocolVersion() : "NULL")); adminReply.replace("%hwid%", (player.getClient() != null) && (player.getClient().getHardwareInfo() != null) ? player.getClient().getHardwareInfo().getMacAddress() : "Unknown"); adminReply.replace("%ai%", player.getAI().getIntention().name()); adminReply.replace("%inst%", player.isInInstance() ? "InstanceId:" + player.getInstanceId() + "" : ""); diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/GameClient.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/GameClient.java index eedfeb53e8..adc47ac7a0 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/GameClient.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/GameClient.java @@ -87,7 +87,9 @@ public class GameClient extends ChannelInboundHandler private volatile boolean _isDetached = false; - private boolean _protocol; + private int _protocolVersion; + + private boolean _protocolOk; private int[][] trace; @@ -650,14 +652,24 @@ public class GameClient extends ChannelInboundHandler } } + public void setProtocolVersion(int version) + { + _protocolVersion = version; + } + + public int getProtocolVersion() + { + return _protocolVersion; + } + public boolean isProtocolOk() { - return _protocol; + return _protocolOk; } public void setProtocolOk(boolean b) { - _protocol = b; + _protocolOk = b; } public void setClientTracert(int[][] tracert) diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java index 1c76ea39e0..1d83a63131 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java @@ -57,6 +57,7 @@ public class ProtocolVersion implements IClientIncomingPacket else { client.sendPacket(new KeyPacket(client.enableCrypt(), 1)); + client.setProtocolVersion(_version); client.setProtocolOk(true); } } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/html/admin/charinfo.htm b/L2J_Mobius_5.0_Salvation/dist/game/data/html/admin/charinfo.htm index e2159069b2..7f57c46e95 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/html/admin/charinfo.htm +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/html/admin/charinfo.htm @@ -40,6 +40,9 @@ Punishment: Info + +Client Protocol: %protocol% +

diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java index d7cd3f6199..90e3992443 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java @@ -1199,6 +1199,7 @@ public class AdminEditChar implements IAdminCommandHandler adminReply.replace("%access%", player.getAccessLevel().getLevel() + " (" + player.getAccessLevel().getName() + ")"); adminReply.replace("%account%", player.getAccountName()); adminReply.replace("%ip%", ip); + adminReply.replace("%protocol%", String.valueOf(player.getClient() != null ? player.getClient().getProtocolVersion() : "NULL")); adminReply.replace("%hwid%", (player.getClient() != null) && (player.getClient().getHardwareInfo() != null) ? player.getClient().getHardwareInfo().getMacAddress() : "Unknown"); adminReply.replace("%ai%", player.getAI().getIntention().name()); adminReply.replace("%inst%", player.isInInstance() ? "InstanceId:" + player.getInstanceId() + "" : ""); diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/GameClient.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/GameClient.java index eedfeb53e8..adc47ac7a0 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/GameClient.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/GameClient.java @@ -87,7 +87,9 @@ public class GameClient extends ChannelInboundHandler private volatile boolean _isDetached = false; - private boolean _protocol; + private int _protocolVersion; + + private boolean _protocolOk; private int[][] trace; @@ -650,14 +652,24 @@ public class GameClient extends ChannelInboundHandler } } + public void setProtocolVersion(int version) + { + _protocolVersion = version; + } + + public int getProtocolVersion() + { + return _protocolVersion; + } + public boolean isProtocolOk() { - return _protocol; + return _protocolOk; } public void setProtocolOk(boolean b) { - _protocol = b; + _protocolOk = b; } public void setClientTracert(int[][] tracert) diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java index 1c76ea39e0..1d83a63131 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java @@ -57,6 +57,7 @@ public class ProtocolVersion implements IClientIncomingPacket else { client.sendPacket(new KeyPacket(client.enableCrypt(), 1)); + client.setProtocolVersion(_version); client.setProtocolOk(true); } } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/html/admin/charinfo.htm b/L2J_Mobius_5.5_EtinasFate/dist/game/data/html/admin/charinfo.htm index e2159069b2..7f57c46e95 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/html/admin/charinfo.htm +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/html/admin/charinfo.htm @@ -40,6 +40,9 @@ Punishment: Info + +Client Protocol: %protocol% +

diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java index d7cd3f6199..90e3992443 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java @@ -1199,6 +1199,7 @@ public class AdminEditChar implements IAdminCommandHandler adminReply.replace("%access%", player.getAccessLevel().getLevel() + " (" + player.getAccessLevel().getName() + ")"); adminReply.replace("%account%", player.getAccountName()); adminReply.replace("%ip%", ip); + adminReply.replace("%protocol%", String.valueOf(player.getClient() != null ? player.getClient().getProtocolVersion() : "NULL")); adminReply.replace("%hwid%", (player.getClient() != null) && (player.getClient().getHardwareInfo() != null) ? player.getClient().getHardwareInfo().getMacAddress() : "Unknown"); adminReply.replace("%ai%", player.getAI().getIntention().name()); adminReply.replace("%inst%", player.isInInstance() ? "InstanceId:" + player.getInstanceId() + "" : ""); diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/GameClient.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/GameClient.java index eedfeb53e8..adc47ac7a0 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/GameClient.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/GameClient.java @@ -87,7 +87,9 @@ public class GameClient extends ChannelInboundHandler private volatile boolean _isDetached = false; - private boolean _protocol; + private int _protocolVersion; + + private boolean _protocolOk; private int[][] trace; @@ -650,14 +652,24 @@ public class GameClient extends ChannelInboundHandler } } + public void setProtocolVersion(int version) + { + _protocolVersion = version; + } + + public int getProtocolVersion() + { + return _protocolVersion; + } + public boolean isProtocolOk() { - return _protocol; + return _protocolOk; } public void setProtocolOk(boolean b) { - _protocol = b; + _protocolOk = b; } public void setClientTracert(int[][] tracert) diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java index 1c76ea39e0..1d83a63131 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java @@ -57,6 +57,7 @@ public class ProtocolVersion implements IClientIncomingPacket else { client.sendPacket(new KeyPacket(client.enableCrypt(), 1)); + client.setProtocolVersion(_version); client.setProtocolOk(true); } } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/html/admin/charinfo.htm b/L2J_Mobius_6.0_Fafurion/dist/game/data/html/admin/charinfo.htm index e2159069b2..7f57c46e95 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/html/admin/charinfo.htm +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/html/admin/charinfo.htm @@ -40,6 +40,9 @@ Punishment: Info + +Client Protocol: %protocol% +

diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java index d7cd3f6199..90e3992443 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java @@ -1199,6 +1199,7 @@ public class AdminEditChar implements IAdminCommandHandler adminReply.replace("%access%", player.getAccessLevel().getLevel() + " (" + player.getAccessLevel().getName() + ")"); adminReply.replace("%account%", player.getAccountName()); adminReply.replace("%ip%", ip); + adminReply.replace("%protocol%", String.valueOf(player.getClient() != null ? player.getClient().getProtocolVersion() : "NULL")); adminReply.replace("%hwid%", (player.getClient() != null) && (player.getClient().getHardwareInfo() != null) ? player.getClient().getHardwareInfo().getMacAddress() : "Unknown"); adminReply.replace("%ai%", player.getAI().getIntention().name()); adminReply.replace("%inst%", player.isInInstance() ? "InstanceId:" + player.getInstanceId() + "" : ""); diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/GameClient.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/GameClient.java index eedfeb53e8..adc47ac7a0 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/GameClient.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/GameClient.java @@ -87,7 +87,9 @@ public class GameClient extends ChannelInboundHandler private volatile boolean _isDetached = false; - private boolean _protocol; + private int _protocolVersion; + + private boolean _protocolOk; private int[][] trace; @@ -650,14 +652,24 @@ public class GameClient extends ChannelInboundHandler } } + public void setProtocolVersion(int version) + { + _protocolVersion = version; + } + + public int getProtocolVersion() + { + return _protocolVersion; + } + public boolean isProtocolOk() { - return _protocol; + return _protocolOk; } public void setProtocolOk(boolean b) { - _protocol = b; + _protocolOk = b; } public void setClientTracert(int[][] tracert) diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java index 1c76ea39e0..1d83a63131 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java @@ -57,6 +57,7 @@ public class ProtocolVersion implements IClientIncomingPacket else { client.sendPacket(new KeyPacket(client.enableCrypt(), 1)); + client.setProtocolVersion(_version); client.setProtocolOk(true); } } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/html/admin/charinfo.htm b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/html/admin/charinfo.htm index e2159069b2..7f57c46e95 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/html/admin/charinfo.htm +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/html/admin/charinfo.htm @@ -40,6 +40,9 @@ Punishment: Info + +Client Protocol: %protocol% +

diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java index d7cd3f6199..90e3992443 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java @@ -1199,6 +1199,7 @@ public class AdminEditChar implements IAdminCommandHandler adminReply.replace("%access%", player.getAccessLevel().getLevel() + " (" + player.getAccessLevel().getName() + ")"); adminReply.replace("%account%", player.getAccountName()); adminReply.replace("%ip%", ip); + adminReply.replace("%protocol%", String.valueOf(player.getClient() != null ? player.getClient().getProtocolVersion() : "NULL")); adminReply.replace("%hwid%", (player.getClient() != null) && (player.getClient().getHardwareInfo() != null) ? player.getClient().getHardwareInfo().getMacAddress() : "Unknown"); adminReply.replace("%ai%", player.getAI().getIntention().name()); adminReply.replace("%inst%", player.isInInstance() ? "InstanceId:" + player.getInstanceId() + "" : ""); diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/GameClient.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/GameClient.java index eedfeb53e8..adc47ac7a0 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/GameClient.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/GameClient.java @@ -87,7 +87,9 @@ public class GameClient extends ChannelInboundHandler private volatile boolean _isDetached = false; - private boolean _protocol; + private int _protocolVersion; + + private boolean _protocolOk; private int[][] trace; @@ -650,14 +652,24 @@ public class GameClient extends ChannelInboundHandler } } + public void setProtocolVersion(int version) + { + _protocolVersion = version; + } + + public int getProtocolVersion() + { + return _protocolVersion; + } + public boolean isProtocolOk() { - return _protocol; + return _protocolOk; } public void setProtocolOk(boolean b) { - _protocol = b; + _protocolOk = b; } public void setClientTracert(int[][] tracert) diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java index 1c76ea39e0..1d83a63131 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java @@ -57,6 +57,7 @@ public class ProtocolVersion implements IClientIncomingPacket else { client.sendPacket(new KeyPacket(client.enableCrypt(), 1)); + client.setProtocolVersion(_version); client.setProtocolOk(true); } } diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/html/admin/charinfo.htm b/L2J_Mobius_C6_Interlude/dist/game/data/html/admin/charinfo.htm index 4d9673a8b9..3e24b3e0f2 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/html/admin/charinfo.htm +++ b/L2J_Mobius_C6_Interlude/dist/game/data/html/admin/charinfo.htm @@ -22,10 +22,10 @@
- - - - + + + +
Account: %account%IP: %ip%
Name: %name%Level: %level%
Clan: %clan%Exp: %xp%
Class: %class%SP: %sp%
Account: %account%IP: %ip%Protocol: %protocol%
Name: %name%Level: %level%
Clan: %clan%Exp: %xp%
Class: %class%SP: %sp%
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminEditChar.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminEditChar.java index f84949ba0a..db66099129 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminEditChar.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminEditChar.java @@ -1072,6 +1072,7 @@ public class AdminEditChar implements IAdminCommandHandler adminReply.replace("%access%", String.valueOf(player.getAccessLevel().getLevel())); adminReply.replace("%account%", account); adminReply.replace("%ip%", ip); + adminReply.replace("%protocol%", String.valueOf(player.getClient() != null ? player.getClient().getProtocolVersion() : "NULL")); activeChar.sendPacket(adminReply); } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/GameClient.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/GameClient.java index d41196b1f4..f224c9b10c 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/GameClient.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/GameClient.java @@ -117,6 +117,8 @@ public class GameClient extends MMOClient> implements private long _last_received_packet_action_time = 0; + private int _protocolVersion; + public GameClient(MMOConnection con) { super(con); @@ -1022,4 +1024,14 @@ public class GameClient extends MMOClient> implements } return true; } + + public void setProtocolVersion(int version) + { + _protocolVersion = version; + } + + public int getProtocolVersion() + { + return _protocolVersion; + } } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java index ac87f222e0..a2d205de12 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java @@ -48,6 +48,7 @@ public class ProtocolVersion extends GameClientPacket } else { + getClient().setProtocolVersion(_version); getClient().sendPacket(new KeyPacket(getClient().enableCrypt())); } } diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/html/admin/charinfo.htm b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/html/admin/charinfo.htm index 29e5004e0a..8ec1f0256c 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/html/admin/charinfo.htm +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/html/admin/charinfo.htm @@ -32,14 +32,17 @@ - - - + + + + + +
Character Coordinates: %x% %y% %z%
Account Name: %account%
Punishment: Info
Account IP: %ip%
HWID: %hwid%
Punishment: Info
Client Protocol: %protocol%


diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java index 41b499a45e..ff4907520d 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java @@ -1087,6 +1087,7 @@ public class AdminEditChar implements IAdminCommandHandler adminReply.replace("%access%", player.getAccessLevel().getLevel() + " (" + player.getAccessLevel().getName() + ")"); adminReply.replace("%account%", player.getAccountName()); adminReply.replace("%ip%", ip); + adminReply.replace("%protocol%", String.valueOf(player.getClient() != null ? player.getClient().getProtocolVersion() : "NULL")); adminReply.replace("%hwid%", hwid); adminReply.replace("%ai%", player.getAI().getIntention().name()); adminReply.replace("%inst%", player.getInstanceId() > 0 ? "InstanceId:" + player.getInstanceId() + "" : ""); diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/GameClient.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/GameClient.java index 10991ea979..8a8b0aa900 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/GameClient.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/GameClient.java @@ -79,7 +79,9 @@ public class GameClient extends ChannelInboundHandler private volatile boolean _isDetached = false; - private boolean _protocol; + private int _protocolVersion; + + private boolean _protocolOk; private int[][] trace; @@ -652,14 +654,24 @@ public class GameClient extends ChannelInboundHandler } } + public void setProtocolVersion(int version) + { + _protocolVersion = version; + } + + public int getProtocolVersion() + { + return _protocolVersion; + } + public boolean isProtocolOk() { - return _protocol; + return _protocolOk; } public void setProtocolOk(boolean b) { - _protocol = b; + _protocolOk = b; } public void setClientTracert(int[][] tracert) diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java index 1704de3d09..b8b7ec4d5c 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java @@ -57,6 +57,7 @@ public class ProtocolVersion implements IClientIncomingPacket else { client.sendPacket(new KeyPacket(client.enableCrypt(), 1)); + client.setProtocolVersion(_version); client.setProtocolOk(true); } } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/html/admin/charinfo.htm b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/html/admin/charinfo.htm index 29e5004e0a..8ec1f0256c 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/html/admin/charinfo.htm +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/html/admin/charinfo.htm @@ -32,14 +32,17 @@ Account Name: %account% -Punishment: Info - - Account IP: %ip% HWID: %hwid% + +Punishment: Info + + +Client Protocol: %protocol% +

diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java index ee8330b957..094c5f7b79 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java @@ -1092,6 +1092,7 @@ public class AdminEditChar implements IAdminCommandHandler adminReply.replace("%access%", player.getAccessLevel().getLevel() + " (" + player.getAccessLevel().getName() + ")"); adminReply.replace("%account%", player.getAccountName()); adminReply.replace("%ip%", ip); + adminReply.replace("%protocol%", String.valueOf(player.getClient() != null ? player.getClient().getProtocolVersion() : "NULL")); adminReply.replace("%hwid%", hwid); adminReply.replace("%ai%", player.getAI().getIntention().name()); adminReply.replace("%inst%", player.getInstanceId() > 0 ? "InstanceId:" + player.getInstanceId() + "" : ""); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/GameClient.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/GameClient.java index 64af161bc6..723084498a 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/GameClient.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/GameClient.java @@ -82,7 +82,9 @@ public class GameClient extends ChannelInboundHandler private volatile boolean _isDetached = false; - private boolean _protocol; + private int _protocolVersion; + + private boolean _protocolOk; private int[][] trace; @@ -664,14 +666,24 @@ public class GameClient extends ChannelInboundHandler } } + public void setProtocolVersion(int version) + { + _protocolVersion = version; + } + + public int getProtocolVersion() + { + return _protocolVersion; + } + public boolean isProtocolOk() { - return _protocol; + return _protocolOk; } public void setProtocolOk(boolean b) { - _protocol = b; + _protocolOk = b; } public void setClientTracert(int[][] tracert) diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java index 1704de3d09..b8b7ec4d5c 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java @@ -57,6 +57,7 @@ public class ProtocolVersion implements IClientIncomingPacket else { client.sendPacket(new KeyPacket(client.enableCrypt(), 1)); + client.setProtocolVersion(_version); client.setProtocolOk(true); } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/html/admin/charinfo.htm b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/html/admin/charinfo.htm index e2159069b2..7f57c46e95 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/html/admin/charinfo.htm +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/html/admin/charinfo.htm @@ -40,6 +40,9 @@ Punishment: Info + +Client Protocol: %protocol% +

diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java index 0b195cd625..2fba23c8f9 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java @@ -1176,6 +1176,7 @@ public class AdminEditChar implements IAdminCommandHandler adminReply.replace("%access%", player.getAccessLevel().getLevel() + " (" + player.getAccessLevel().getName() + ")"); adminReply.replace("%account%", player.getAccountName()); adminReply.replace("%ip%", ip); + adminReply.replace("%protocol%", String.valueOf(player.getClient() != null ? player.getClient().getProtocolVersion() : "NULL")); adminReply.replace("%hwid%", (player.getClient() != null) && (player.getClient().getHardwareInfo() != null) ? player.getClient().getHardwareInfo().getMacAddress() : "Unknown"); adminReply.replace("%ai%", player.getAI().getIntention().name()); adminReply.replace("%inst%", player.isInInstance() ? "InstanceId:" + player.getInstanceId() + "" : ""); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/GameClient.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/GameClient.java index eedfeb53e8..adc47ac7a0 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/GameClient.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/GameClient.java @@ -87,7 +87,9 @@ public class GameClient extends ChannelInboundHandler private volatile boolean _isDetached = false; - private boolean _protocol; + private int _protocolVersion; + + private boolean _protocolOk; private int[][] trace; @@ -650,14 +652,24 @@ public class GameClient extends ChannelInboundHandler } } + public void setProtocolVersion(int version) + { + _protocolVersion = version; + } + + public int getProtocolVersion() + { + return _protocolVersion; + } + public boolean isProtocolOk() { - return _protocol; + return _protocolOk; } public void setProtocolOk(boolean b) { - _protocol = b; + _protocolOk = b; } public void setClientTracert(int[][] tracert) diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java index 1c76ea39e0..1d83a63131 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java @@ -57,6 +57,7 @@ public class ProtocolVersion implements IClientIncomingPacket else { client.sendPacket(new KeyPacket(client.enableCrypt(), 1)); + client.setProtocolVersion(_version); client.setProtocolOk(true); } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/html/admin/charinfo.htm b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/html/admin/charinfo.htm index e2159069b2..7f57c46e95 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/html/admin/charinfo.htm +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/html/admin/charinfo.htm @@ -40,6 +40,9 @@ Punishment: Info + +Client Protocol: %protocol% +

diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java index 0b195cd625..2fba23c8f9 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java @@ -1176,6 +1176,7 @@ public class AdminEditChar implements IAdminCommandHandler adminReply.replace("%access%", player.getAccessLevel().getLevel() + " (" + player.getAccessLevel().getName() + ")"); adminReply.replace("%account%", player.getAccountName()); adminReply.replace("%ip%", ip); + adminReply.replace("%protocol%", String.valueOf(player.getClient() != null ? player.getClient().getProtocolVersion() : "NULL")); adminReply.replace("%hwid%", (player.getClient() != null) && (player.getClient().getHardwareInfo() != null) ? player.getClient().getHardwareInfo().getMacAddress() : "Unknown"); adminReply.replace("%ai%", player.getAI().getIntention().name()); adminReply.replace("%inst%", player.isInInstance() ? "InstanceId:" + player.getInstanceId() + "" : ""); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/GameClient.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/GameClient.java index eedfeb53e8..adc47ac7a0 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/GameClient.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/GameClient.java @@ -87,7 +87,9 @@ public class GameClient extends ChannelInboundHandler private volatile boolean _isDetached = false; - private boolean _protocol; + private int _protocolVersion; + + private boolean _protocolOk; private int[][] trace; @@ -650,14 +652,24 @@ public class GameClient extends ChannelInboundHandler } } + public void setProtocolVersion(int version) + { + _protocolVersion = version; + } + + public int getProtocolVersion() + { + return _protocolVersion; + } + public boolean isProtocolOk() { - return _protocol; + return _protocolOk; } public void setProtocolOk(boolean b) { - _protocol = b; + _protocolOk = b; } public void setClientTracert(int[][] tracert) diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java index 1c76ea39e0..1d83a63131 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java @@ -57,6 +57,7 @@ public class ProtocolVersion implements IClientIncomingPacket else { client.sendPacket(new KeyPacket(client.enableCrypt(), 1)); + client.setProtocolVersion(_version); client.setProtocolOk(true); } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/html/admin/charinfo.htm b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/html/admin/charinfo.htm index e2159069b2..7f57c46e95 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/html/admin/charinfo.htm +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/html/admin/charinfo.htm @@ -40,6 +40,9 @@ Punishment: Info + +Client Protocol: %protocol% +

diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java index c0acc69ca4..fa96762f06 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java @@ -1176,6 +1176,7 @@ public class AdminEditChar implements IAdminCommandHandler adminReply.replace("%access%", player.getAccessLevel().getLevel() + " (" + player.getAccessLevel().getName() + ")"); adminReply.replace("%account%", player.getAccountName()); adminReply.replace("%ip%", ip); + adminReply.replace("%protocol%", String.valueOf(player.getClient() != null ? player.getClient().getProtocolVersion() : "NULL")); adminReply.replace("%hwid%", (player.getClient() != null) && (player.getClient().getHardwareInfo() != null) ? player.getClient().getHardwareInfo().getMacAddress() : "Unknown"); adminReply.replace("%ai%", player.getAI().getIntention().name()); adminReply.replace("%inst%", player.isInInstance() ? "InstanceId:" + player.getInstanceId() + "" : ""); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/GameClient.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/GameClient.java index eedfeb53e8..adc47ac7a0 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/GameClient.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/GameClient.java @@ -87,7 +87,9 @@ public class GameClient extends ChannelInboundHandler private volatile boolean _isDetached = false; - private boolean _protocol; + private int _protocolVersion; + + private boolean _protocolOk; private int[][] trace; @@ -650,14 +652,24 @@ public class GameClient extends ChannelInboundHandler } } + public void setProtocolVersion(int version) + { + _protocolVersion = version; + } + + public int getProtocolVersion() + { + return _protocolVersion; + } + public boolean isProtocolOk() { - return _protocol; + return _protocolOk; } public void setProtocolOk(boolean b) { - _protocol = b; + _protocolOk = b; } public void setClientTracert(int[][] tracert) diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java index 1c76ea39e0..1d83a63131 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java @@ -57,6 +57,7 @@ public class ProtocolVersion implements IClientIncomingPacket else { client.sendPacket(new KeyPacket(client.enableCrypt(), 1)); + client.setProtocolVersion(_version); client.setProtocolOk(true); } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/html/admin/charinfo.htm b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/html/admin/charinfo.htm index e2159069b2..7f57c46e95 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/html/admin/charinfo.htm +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/html/admin/charinfo.htm @@ -40,6 +40,9 @@ Punishment: Info + +Client Protocol: %protocol% +

diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java index c0acc69ca4..fa96762f06 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java @@ -1176,6 +1176,7 @@ public class AdminEditChar implements IAdminCommandHandler adminReply.replace("%access%", player.getAccessLevel().getLevel() + " (" + player.getAccessLevel().getName() + ")"); adminReply.replace("%account%", player.getAccountName()); adminReply.replace("%ip%", ip); + adminReply.replace("%protocol%", String.valueOf(player.getClient() != null ? player.getClient().getProtocolVersion() : "NULL")); adminReply.replace("%hwid%", (player.getClient() != null) && (player.getClient().getHardwareInfo() != null) ? player.getClient().getHardwareInfo().getMacAddress() : "Unknown"); adminReply.replace("%ai%", player.getAI().getIntention().name()); adminReply.replace("%inst%", player.isInInstance() ? "InstanceId:" + player.getInstanceId() + "" : ""); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/GameClient.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/GameClient.java index eedfeb53e8..adc47ac7a0 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/GameClient.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/GameClient.java @@ -87,7 +87,9 @@ public class GameClient extends ChannelInboundHandler private volatile boolean _isDetached = false; - private boolean _protocol; + private int _protocolVersion; + + private boolean _protocolOk; private int[][] trace; @@ -650,14 +652,24 @@ public class GameClient extends ChannelInboundHandler } } + public void setProtocolVersion(int version) + { + _protocolVersion = version; + } + + public int getProtocolVersion() + { + return _protocolVersion; + } + public boolean isProtocolOk() { - return _protocol; + return _protocolOk; } public void setProtocolOk(boolean b) { - _protocol = b; + _protocolOk = b; } public void setClientTracert(int[][] tracert) diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java index 1c76ea39e0..1d83a63131 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java @@ -57,6 +57,7 @@ public class ProtocolVersion implements IClientIncomingPacket else { client.sendPacket(new KeyPacket(client.enableCrypt(), 1)); + client.setProtocolVersion(_version); client.setProtocolOk(true); } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/html/admin/charinfo.htm b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/html/admin/charinfo.htm index e2159069b2..7f57c46e95 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/html/admin/charinfo.htm +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/html/admin/charinfo.htm @@ -40,6 +40,9 @@ Punishment: Info + +Client Protocol: %protocol% +

diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java index c0acc69ca4..fa96762f06 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java @@ -1176,6 +1176,7 @@ public class AdminEditChar implements IAdminCommandHandler adminReply.replace("%access%", player.getAccessLevel().getLevel() + " (" + player.getAccessLevel().getName() + ")"); adminReply.replace("%account%", player.getAccountName()); adminReply.replace("%ip%", ip); + adminReply.replace("%protocol%", String.valueOf(player.getClient() != null ? player.getClient().getProtocolVersion() : "NULL")); adminReply.replace("%hwid%", (player.getClient() != null) && (player.getClient().getHardwareInfo() != null) ? player.getClient().getHardwareInfo().getMacAddress() : "Unknown"); adminReply.replace("%ai%", player.getAI().getIntention().name()); adminReply.replace("%inst%", player.isInInstance() ? "InstanceId:" + player.getInstanceId() + "" : ""); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/GameClient.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/GameClient.java index eedfeb53e8..adc47ac7a0 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/GameClient.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/GameClient.java @@ -87,7 +87,9 @@ public class GameClient extends ChannelInboundHandler private volatile boolean _isDetached = false; - private boolean _protocol; + private int _protocolVersion; + + private boolean _protocolOk; private int[][] trace; @@ -650,14 +652,24 @@ public class GameClient extends ChannelInboundHandler } } + public void setProtocolVersion(int version) + { + _protocolVersion = version; + } + + public int getProtocolVersion() + { + return _protocolVersion; + } + public boolean isProtocolOk() { - return _protocol; + return _protocolOk; } public void setProtocolOk(boolean b) { - _protocol = b; + _protocolOk = b; } public void setClientTracert(int[][] tracert) diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java index 1c76ea39e0..1d83a63131 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java @@ -57,6 +57,7 @@ public class ProtocolVersion implements IClientIncomingPacket else { client.sendPacket(new KeyPacket(client.enableCrypt(), 1)); + client.setProtocolVersion(_version); client.setProtocolOk(true); } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/html/admin/charinfo.htm b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/html/admin/charinfo.htm index e2159069b2..7f57c46e95 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/html/admin/charinfo.htm +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/html/admin/charinfo.htm @@ -40,6 +40,9 @@ Punishment: Info + +Client Protocol: %protocol% +

diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java index 1cf10d25b5..b413f3dbae 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java @@ -1164,6 +1164,7 @@ public class AdminEditChar implements IAdminCommandHandler adminReply.replace("%access%", player.getAccessLevel().getLevel() + " (" + player.getAccessLevel().getName() + ")"); adminReply.replace("%account%", player.getAccountName()); adminReply.replace("%ip%", ip); + adminReply.replace("%protocol%", String.valueOf(player.getClient() != null ? player.getClient().getProtocolVersion() : "NULL")); adminReply.replace("%hwid%", (player.getClient() != null) && (player.getClient().getHardwareInfo() != null) ? player.getClient().getHardwareInfo().getMacAddress() : "Unknown"); adminReply.replace("%ai%", player.getAI().getIntention().name()); adminReply.replace("%inst%", player.isInInstance() ? "InstanceId:" + player.getInstanceId() + "" : ""); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/GameClient.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/GameClient.java index eedfeb53e8..adc47ac7a0 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/GameClient.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/GameClient.java @@ -87,7 +87,9 @@ public class GameClient extends ChannelInboundHandler private volatile boolean _isDetached = false; - private boolean _protocol; + private int _protocolVersion; + + private boolean _protocolOk; private int[][] trace; @@ -650,14 +652,24 @@ public class GameClient extends ChannelInboundHandler } } + public void setProtocolVersion(int version) + { + _protocolVersion = version; + } + + public int getProtocolVersion() + { + return _protocolVersion; + } + public boolean isProtocolOk() { - return _protocol; + return _protocolOk; } public void setProtocolOk(boolean b) { - _protocol = b; + _protocolOk = b; } public void setClientTracert(int[][] tracert) diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java index 1c76ea39e0..1d83a63131 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java @@ -57,6 +57,7 @@ public class ProtocolVersion implements IClientIncomingPacket else { client.sendPacket(new KeyPacket(client.enableCrypt(), 1)); + client.setProtocolVersion(_version); client.setProtocolOk(true); } } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/html/admin/charinfo.htm b/L2J_Mobius_Classic_Interlude/dist/game/data/html/admin/charinfo.htm index e2159069b2..7f57c46e95 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/html/admin/charinfo.htm +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/html/admin/charinfo.htm @@ -40,6 +40,9 @@ Punishment: Info + +Client Protocol: %protocol% +

diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java index 0b195cd625..2fba23c8f9 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java @@ -1176,6 +1176,7 @@ public class AdminEditChar implements IAdminCommandHandler adminReply.replace("%access%", player.getAccessLevel().getLevel() + " (" + player.getAccessLevel().getName() + ")"); adminReply.replace("%account%", player.getAccountName()); adminReply.replace("%ip%", ip); + adminReply.replace("%protocol%", String.valueOf(player.getClient() != null ? player.getClient().getProtocolVersion() : "NULL")); adminReply.replace("%hwid%", (player.getClient() != null) && (player.getClient().getHardwareInfo() != null) ? player.getClient().getHardwareInfo().getMacAddress() : "Unknown"); adminReply.replace("%ai%", player.getAI().getIntention().name()); adminReply.replace("%inst%", player.isInInstance() ? "InstanceId:" + player.getInstanceId() + "" : ""); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/GameClient.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/GameClient.java index eedfeb53e8..adc47ac7a0 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/GameClient.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/GameClient.java @@ -87,7 +87,9 @@ public class GameClient extends ChannelInboundHandler private volatile boolean _isDetached = false; - private boolean _protocol; + private int _protocolVersion; + + private boolean _protocolOk; private int[][] trace; @@ -650,14 +652,24 @@ public class GameClient extends ChannelInboundHandler } } + public void setProtocolVersion(int version) + { + _protocolVersion = version; + } + + public int getProtocolVersion() + { + return _protocolVersion; + } + public boolean isProtocolOk() { - return _protocol; + return _protocolOk; } public void setProtocolOk(boolean b) { - _protocol = b; + _protocolOk = b; } public void setClientTracert(int[][] tracert) diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java index 1c76ea39e0..1d83a63131 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java @@ -57,6 +57,7 @@ public class ProtocolVersion implements IClientIncomingPacket else { client.sendPacket(new KeyPacket(client.enableCrypt(), 1)); + client.setProtocolVersion(_version); client.setProtocolOk(true); } }