From d92b0d9627cfce66a6557786546f58135beda7d2 Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Tue, 31 Dec 2019 13:43:01 +0000 Subject: [PATCH] Dropped login support for protocol 235. --- .../dist/game/config/Server.ini | 3 +-- .../gameserver/network/serverpackets/UserInfo.java | 14 +------------- L2J_Mobius_7.0_PreludeOfWar/readme.txt | 6 +----- .../dist/game/config/Server.ini | 3 +-- .../gameserver/network/serverpackets/UserInfo.java | 14 +------------- L2J_Mobius_Classic_3.0_TheKamael/readme.txt | 6 +----- 6 files changed, 6 insertions(+), 40 deletions(-) diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/config/Server.ini b/L2J_Mobius_7.0_PreludeOfWar/dist/game/config/Server.ini index 237b068240..394daf7164 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/config/Server.ini +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/config/Server.ini @@ -102,8 +102,7 @@ MaximumOnlineUsers = 2000 # Delimiter is ; # WARNING: Changing the protocol revision may result in incompatible communication and many errors in game! # Prelude of War: 228 -# Prelude of War - Part 2: 235 -AllowedProtocolRevisions = 228;235 +AllowedProtocolRevisions = 228 # Displays server type next to the server name on character selection. # Notes: diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java index bf4a52c86f..c2430da720 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java @@ -138,13 +138,11 @@ public class UserInfo extends AbstractMaskPacket return false; } - final boolean isProtocol235 = (_player.getClient() != null) && (_player.getClient().getProtocolVersion() == 235); - OutgoingPackets.USER_INFO.writeId(packet); packet.writeD(_player.getObjectId()); packet.writeD(_initSize); - packet.writeH(isProtocol235 ? 27 : 25); // 196 - 25, 235 - 27 + packet.writeH(25); // 196 - 25 packet.writeB(_masks); if (containsMask(UserInfoType.RELATION)) @@ -414,16 +412,6 @@ public class UserInfo extends AbstractMaskPacket packet.writeD(0x00); } - if (isProtocol235) - { - // 1 - packet.writeH(6); - packet.writeC(0); - // 2 - packet.writeH(6); - packet.writeC(0); - } - return true; } diff --git a/L2J_Mobius_7.0_PreludeOfWar/readme.txt b/L2J_Mobius_7.0_PreludeOfWar/readme.txt index 6143ec6f6e..5de057801b 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/readme.txt +++ b/L2J_Mobius_7.0_PreludeOfWar/readme.txt @@ -1,12 +1,8 @@ -L2J-Mobius Prelude of War (protocol 228) +L2J-Mobius Prelude of War Client Mirror 1: https://drive.google.com/uc?id=1rXtgV9l67b5lBeK_wmCKITE1DQ7EgEJ8&export=download Client Mirror 2: https://drive.google.com/uc?id=1IugZjcpS5n9_EJPLCecB3H_tLmVlqo2L&export=download System: https://mega.nz/#!98likSra!vP3uaDwJs8oiY5q60UzBSXAbgNELWX_dycWb98Mz96U -L2J-Mobius Prelude of War - Part 2 (protocol 235) [Login support only!] -Client: https://drive.google.com/uc?id=1MFxyk0upVRqW1HSnkgqvD3As2JAWEMGk&export=download -System: https://mega.nz/#!IsEhQI4K!DkdkNgUmu79by1Ogc0qcAE5P4kJAVqzKhlhDL3iZTwA - Geodata: http://www.mediafire.com/file/w6f0r5opnlopzbq/L2J_Mobius_6.0_Fafurion_Geodata.zip JDK: https://www.mediafire.com/file/k25pt0umuf16uoh/openjdk-12.0.2_windows-x64_bin.zip diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/config/Server.ini b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/config/Server.ini index da414ee5e6..352f1d6e0c 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/config/Server.ini +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/config/Server.ini @@ -102,8 +102,7 @@ MaximumOnlineUsers = 2000 # Delimiter is ; # WARNING: Changing the protocol revision may result in incompatible communication and many errors in game! # The Kamael: 228 -# Essence: 235 -AllowedProtocolRevisions = 228;235 +AllowedProtocolRevisions = 228 # Displays server type next to the server name on character selection. # Notes: diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java index 1deba449f7..3da3e89269 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java @@ -136,13 +136,11 @@ public class UserInfo extends AbstractMaskPacket return false; } - final boolean isProtocol235 = (_player.getClient() != null) && (_player.getClient().getProtocolVersion() == 235); - OutgoingPackets.USER_INFO.writeId(packet); packet.writeD(_player.getObjectId()); packet.writeD(_initSize); - packet.writeH(isProtocol235 ? 27 : 25); // 196 - 25, 235 - 27 + packet.writeH(25); // 196 - 25 packet.writeB(_masks); if (containsMask(UserInfoType.RELATION)) @@ -427,16 +425,6 @@ public class UserInfo extends AbstractMaskPacket packet.writeD(0x00); } - if (isProtocol235) - { - // 1 - packet.writeH(6); - packet.writeC(0); - // 2 - packet.writeH(6); - packet.writeC(0); - } - return true; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/readme.txt b/L2J_Mobius_Classic_3.0_TheKamael/readme.txt index 6f5bbb6ecb..b5c2690866 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/readme.txt +++ b/L2J_Mobius_Classic_3.0_TheKamael/readme.txt @@ -1,12 +1,8 @@ -L2J-Mobius The Kamael (protocol 228) +L2J-Mobius The Kamael Client Mirror 1: https://drive.google.com/uc?id=1rXtgV9l67b5lBeK_wmCKITE1DQ7EgEJ8&export=download Client Mirror 2: https://drive.google.com/uc?id=1IugZjcpS5n9_EJPLCecB3H_tLmVlqo2L&export=download System: https://mega.nz/#!98likSra!vP3uaDwJs8oiY5q60UzBSXAbgNELWX_dycWb98Mz96U -L2J-Mobius Essence (protocol 235) [Login support only!] -Client: https://drive.google.com/uc?id=1MFxyk0upVRqW1HSnkgqvD3As2JAWEMGk&export=download -System: https://mega.nz/#!IsEhQI4K!DkdkNgUmu79by1Ogc0qcAE5P4kJAVqzKhlhDL3iZTwA - Geodata: http://www.mediafire.com/file/tas8fp9ee2r6mn9/L2J_Mobius_Classic_2.2_Antharas_Geodata.zip JDK: https://www.mediafire.com/file/k25pt0umuf16uoh/openjdk-12.0.2_windows-x64_bin.zip