Fix disconnection issues in #1540.

Signed-off-by: 秋雨落 <[email protected]>
IzzelAliz · Nov 10, 2024 · 3ac72c8 · 3ac72c8
1 parent a4fc8e0
commit 3ac72c8
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 18 deletions.
diff --git a/...ght-common/src/main/java/io/izzel/arclight/common/mixin/core/network/ConnectionMixin.java b/...ght-common/src/main/java/io/izzel/arclight/common/mixin/core/network/ConnectionMixin.java
@@ -3,13 +3,19 @@
 import com.mojang.authlib.properties.Property;
 import io.izzel.arclight.common.bridge.core.network.NetworkManagerBridge;
 import net.minecraft.network.Connection;
+import net.minecraft.network.DisconnectionDetails;
 import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 import java.util.UUID;
 
 @Mixin(Connection.class)
 public class ConnectionMixin implements NetworkManagerBridge {
 
+    @Shadow public boolean disconnectionHandled;
     public java.util.UUID spoofedUUID;
     public com.mojang.authlib.properties.Property[] spoofedProfile;
     public String hostname;
@@ -43,4 +49,11 @@ public class ConnectionMixin implements NetworkManagerBridge {
     public void bridge$setHostname(String hostname) {
         this.hostname = hostname;
     }
+
+    @Inject(method = "handleDisconnection", at = @At("HEAD"), cancellable = true)
+    private void arclight$noDisconnectTwiceWarn(CallbackInfo ci) {
+        if (disconnectionHandled) {
+            ci.cancel();
+        }
+    }
 }
diff --git a/.../src/main/java/io/izzel/arclight/common/mixin/core/server/management/PlayerListMixin.java b/.../src/main/java/io/izzel/arclight/common/mixin/core/server/management/PlayerListMixin.java
@@ -214,14 +214,14 @@ public abstract class PlayerListMixin implements PlayerListBridge {
     public ServerPlayer bridge$canPlayerLogin(SocketAddress socketAddress, GameProfile gameProfile, ServerLoginPacketListenerImpl handler) {
         UUID uuid = gameProfile.getId();
         List<ServerPlayer> list = Lists.newArrayList();
-        for (ServerPlayer entityplayer : this.players) {
-            if (entityplayer.getUUID().equals(uuid)) {
-                list.add(entityplayer);
+        for (ServerPlayer player : this.players) {
+            if (player.getUUID().equals(uuid)) {
+                list.add(player);
             }
         }
-        for (ServerPlayer entityplayer : list) {
-            this.save(entityplayer);
-            entityplayer.connection.disconnect(Component.translatable("multiplayer.disconnect.duplicate_login"));
+        for (ServerPlayer player : list) {
+            this.save(player);
+            player.connection.disconnect(Component.translatable("multiplayer.disconnect.duplicate_login"));
         }
         ServerPlayer entity = new ServerPlayer(this.server, this.server.getLevel(Level.OVERWORLD), gameProfile, ClientInformation.createDefault());
         ((ServerPlayerEntityBridge) entity).bridge$setTransferCookieConnection((CraftPlayer.TransferCookieConnection) handler);
@@ -231,22 +231,22 @@ public abstract class PlayerListMixin implements PlayerListBridge {
         InetAddress realAddress = handler == null ? ((InetSocketAddress) socketAddress).getAddress() : ((InetSocketAddress) handler.connection.channel.remoteAddress()).getAddress();
 
         PlayerLoginEvent event = new PlayerLoginEvent(player, hostname, ((InetSocketAddress) socketAddress).getAddress(), realAddress);
-        if (this.getBans().isBanned(gameProfile) && !this.getBans().get(gameProfile).hasExpired()) {
-            UserBanListEntry gameprofilebanentry = this.bans.get(gameProfile);
-            var chatmessage = Component.translatable("multiplayer.disconnect.banned.reason", gameprofilebanentry.getReason());
-            if (gameprofilebanentry.getExpires() != null) {
-                chatmessage.append(Component.translatable("multiplayer.disconnect.banned.expiration", BAN_DATE_FORMAT.format(gameprofilebanentry.getExpires())));
+        if (this.getBans().isBanned(gameProfile) && this.getBans().get(gameProfile) != null && !this.getBans().get(gameProfile).hasExpired()) {
+            UserBanListEntry entry = this.bans.get(gameProfile);
+            var message = Component.translatable("multiplayer.disconnect.banned.reason", entry.getReason());
+            if (entry.getExpires() != null) {
+                message.append(Component.translatable("multiplayer.disconnect.banned.expiration", BAN_DATE_FORMAT.format(entry.getExpires())));
             }
-            event.disallow(PlayerLoginEvent.Result.KICK_BANNED, CraftChatMessage.fromComponent(chatmessage));
+            event.disallow(PlayerLoginEvent.Result.KICK_BANNED, CraftChatMessage.fromComponent(message));
         } else if (!this.isWhiteListed(gameProfile)) {
             event.disallow(PlayerLoginEvent.Result.KICK_WHITELIST, SpigotConfig.whitelistMessage);
-        } else if (this.getIpBans().isBanned(socketAddress) && !this.getIpBans().get(socketAddress).hasExpired()) {
-            IpBanListEntry ipbanentry = this.ipBans.get(socketAddress);
-            var chatmessage = Component.translatable("multiplayer.disconnect.banned_ip.reason", ipbanentry.getReason());
-            if (ipbanentry.getExpires() != null) {
-                chatmessage.append(Component.translatable("multiplayer.disconnect.banned_ip.expiration", BAN_DATE_FORMAT.format(ipbanentry.getExpires())));
+        } else if (this.getIpBans().isBanned(socketAddress) && this.getIpBans().get(socketAddress) != null && !this.getIpBans().get(socketAddress).hasExpired()) {
+            IpBanListEntry entry = this.ipBans.get(socketAddress);
+            var message = Component.translatable("multiplayer.disconnect.banned_ip.reason", entry.getReason());
+            if (entry.getExpires() != null) {
+                message.append(Component.translatable("multiplayer.disconnect.banned_ip.expiration", BAN_DATE_FORMAT.format(entry.getExpires())));
             }
-            event.disallow(PlayerLoginEvent.Result.KICK_BANNED, CraftChatMessage.fromComponent(chatmessage));
+            event.disallow(PlayerLoginEvent.Result.KICK_BANNED, CraftChatMessage.fromComponent(message));
         } else if (this.players.size() >= this.maxPlayers && !this.canBypassPlayerLimit(gameProfile)) {
             event.disallow(PlayerLoginEvent.Result.KICK_FULL, SpigotConfig.serverFullMessage);
         }