Add support for showing disconnect message on 1.19+

Axionize · Axionize · commit 4abb430ebffa · 2025-04-25T03:02:37.000-04:00
diff --git a/fabric/mc1140/src/main/java/io/github/retrooper/packetevents/mc1140/Fabric1140ChainLoadEntrypoint.java b/fabric/mc1140/src/main/java/io/github/retrooper/packetevents/mc1140/Fabric1140ChainLoadEntrypoint.java
@@ -2,17 +2,17 @@
 
 import com.github.retrooper.packetevents.manager.server.ServerVersion;
 import io.github.retrooper.packetevents.factory.fabric.FabricPacketEventsAPI;
+import io.github.retrooper.packetevents.manager.AbstractFabricPlayerManager;
 import io.github.retrooper.packetevents.manager.registry.FabricRegistryManager;
 import io.github.retrooper.packetevents.mc1140.manager.registry.Fabric1140ItemRegistry;
 import io.github.retrooper.packetevents.util.LazyHolder;
-import io.github.retrooper.packetevents.impl.netty.manager.player.PlayerManagerAbstract;
 import io.github.retrooper.packetevents.loader.ChainLoadData;
 import io.github.retrooper.packetevents.loader.ChainLoadEntryPoint;
 import io.github.retrooper.packetevents.mc1140.factory.fabric.Fabric1140ServerPlayerManager;
 
 public class Fabric1140ChainLoadEntrypoint implements ChainLoadEntryPoint {
 
-    protected LazyHolder<PlayerManagerAbstract> playerManagerAbstractLazyHolder = LazyHolder.simple(() -> new Fabric1140ServerPlayerManager(FabricPacketEventsAPI.getServerAPI()));
+    protected LazyHolder<AbstractFabricPlayerManager> playerManagerAbstractLazyHolder = LazyHolder.simple(() -> new Fabric1140ServerPlayerManager(FabricPacketEventsAPI.getServerAPI()));
 
     @Override
     public void initialize(ChainLoadData chainLoadData) {
diff --git a/fabric/mc1140/src/main/java/io/github/retrooper/packetevents/mc1140/factory/fabric/Fabric1140ServerPlayerManager.java b/fabric/mc1140/src/main/java/io/github/retrooper/packetevents/mc1140/factory/fabric/Fabric1140ServerPlayerManager.java
@@ -20,6 +20,7 @@
 
 import com.github.retrooper.packetevents.PacketEventsAPI;
 import io.github.retrooper.packetevents.manager.AbstractFabricPlayerManager;
+import net.minecraft.network.chat.TextComponent;
 import net.minecraft.server.network.ServerPlayerEntity;
 import org.jetbrains.annotations.NotNull;
 
@@ -44,4 +45,9 @@ public Object getChannel(@NotNull Object player) {
         }
         throw new UnsupportedOperationException("Unsupported player implementation: " + player);
     }
+
+    @Override
+    public void disconnectPlayer(ServerPlayerEntity serverPlayerEntity, String message) {
+        serverPlayerEntity.networkHandler.disconnect(new TextComponent(message));
+    }
 }
diff --git a/fabric/mc1194/build.gradle.kts b/fabric/mc1194/build.gradle.kts
@@ -6,6 +6,7 @@ repositories {
 }
 
 dependencies {
+    compileOnly(project(":fabric:mc1140", configuration = "namedElements"))
     // To change the versions, see the gradle.properties file
     minecraft("com.mojang:minecraft:$minecraft_version")
     mappings("net.fabricmc:yarn:$yarn_mappings")
diff --git a/fabric/mc1194/src/main/java/io/github/retrooper/packetevents/mc1914/Fabric1913ChainLoadEntrypoint.java b/fabric/mc1194/src/main/java/io/github/retrooper/packetevents/mc1914/Fabric1913ChainLoadEntrypoint.java
@@ -1,18 +1,23 @@
 package io.github.retrooper.packetevents.mc1914;
 
 import com.github.retrooper.packetevents.manager.server.ServerVersion;
+import io.github.retrooper.packetevents.factory.fabric.FabricPacketEventsAPI;
 import io.github.retrooper.packetevents.loader.ChainLoadData;
 import io.github.retrooper.packetevents.loader.ChainLoadEntryPoint;
+import io.github.retrooper.packetevents.manager.FabricServerManager;
 import io.github.retrooper.packetevents.manager.registry.FabricRegistryManager;
+import io.github.retrooper.packetevents.mc1140.manager.registry.Fabric1140ItemRegistry;
+import io.github.retrooper.packetevents.mc1914.factory.fabric.Fabric1190ServerPlayerManager;
 import io.github.retrooper.packetevents.mc1914.manager.registry.Fabric1193ItemRegistry;
 import io.github.retrooper.packetevents.util.LazyHolder;
 
 public class Fabric1913ChainLoadEntrypoint implements ChainLoadEntryPoint {
 
     @Override
     public void initialize(ChainLoadData chainLoadData) {
+        chainLoadData.setPlayerManagerIfNull(LazyHolder.simple(() -> new Fabric1190ServerPlayerManager(FabricPacketEventsAPI.getServerAPI())));
         chainLoadData.setRegistryManagerIfNull(LazyHolder.simple(() ->
-                new FabricRegistryManager(new Fabric1193ItemRegistry())
+                new FabricRegistryManager(FabricServerManager.getVersionStatically().isNewerThan(ServerVersion.V_1_19_2) ? new Fabric1193ItemRegistry() : new Fabric1140ItemRegistry())
         ));
     }
 
diff --git a/fabric/mc1194/src/main/java/io/github/retrooper/packetevents/mc1914/factory/fabric/Fabric1190ServerPlayerManager.java b/fabric/mc1194/src/main/java/io/github/retrooper/packetevents/mc1914/factory/fabric/Fabric1190ServerPlayerManager.java
@@ -0,0 +1,37 @@
+/*
+ * This file is part of packetevents - https://github.com/retrooper/packetevents
+ * Copyright (C) 2024 retrooper and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package io.github.retrooper.packetevents.mc1914.factory.fabric;
+
+import com.github.retrooper.packetevents.PacketEventsAPI;
+import io.github.retrooper.packetevents.mc1140.factory.fabric.Fabric1140ServerPlayerManager;
+import net.minecraft.server.network.ServerPlayerEntity;
+import net.minecraft.text.Text;
+
+public class Fabric1190ServerPlayerManager extends Fabric1140ServerPlayerManager {
+
+    public Fabric1190ServerPlayerManager(PacketEventsAPI<?> packetEventsAPI) {
+        super(packetEventsAPI);
+    }
+
+    // new TextComponent -> Text.literal in 1.19
+    @Override
+    public void disconnectPlayer(ServerPlayerEntity serverPlayerEntity, String message) {
+        serverPlayerEntity.networkHandler.disconnect(Text.literal(message));
+    }
+}
diff --git a/fabric/mc1194/src/main/resources/fabric.mod.json b/fabric/mc1194/src/main/resources/fabric.mod.json
@@ -2,7 +2,7 @@
   "schemaVersion": 1,
   "id": "${modName}",
   "version": "${version}",
-  "name": "PacketEvents dependency for 1.19.3+ compiled against ${minecraft_version}",
+  "name": "PacketEvents dependency for 1.19+ compiled against ${minecraft_version}",
   "description": "",
   "authors": [
     "retrooper"
@@ -21,6 +21,6 @@
   "accessWidener": "packetevents.accesswidener",
   "depends": {
     "fabricloader": "*",
-    "minecraft": ">=1.19.3"
+    "minecraft": ">=1.19"
   }
 }
diff --git a/fabric/mc1202/src/main/java/io/github/retrooper/packetevents/mc1202/Fabric1202ChainLoadEntrypoint.java b/fabric/mc1202/src/main/java/io/github/retrooper/packetevents/mc1202/Fabric1202ChainLoadEntrypoint.java
@@ -2,15 +2,15 @@
 
 import com.github.retrooper.packetevents.manager.server.ServerVersion;
 import io.github.retrooper.packetevents.factory.fabric.FabricPacketEventsAPI;
+import io.github.retrooper.packetevents.manager.AbstractFabricPlayerManager;
 import io.github.retrooper.packetevents.util.LazyHolder;
-import io.github.retrooper.packetevents.impl.netty.manager.player.PlayerManagerAbstract;
 import io.github.retrooper.packetevents.loader.ChainLoadData;
 import io.github.retrooper.packetevents.loader.ChainLoadEntryPoint;
 import io.github.retrooper.packetevents.mc1202.factory.fabric.Fabric1202ServerPlayerManager;
 
 public class Fabric1202ChainLoadEntrypoint implements ChainLoadEntryPoint {
 
-    protected LazyHolder<PlayerManagerAbstract> playerManagerAbstractLazyHolder = LazyHolder.simple(() -> new Fabric1202ServerPlayerManager(FabricPacketEventsAPI.getServerAPI()));
+    protected LazyHolder<AbstractFabricPlayerManager> playerManagerAbstractLazyHolder = LazyHolder.simple(() -> new Fabric1202ServerPlayerManager(FabricPacketEventsAPI.getServerAPI()));
 
     @Override
     public void initialize(ChainLoadData chainLoadData) {
diff --git a/fabric/mc1202/src/main/java/io/github/retrooper/packetevents/mc1202/factory/fabric/Fabric1202ServerPlayerManager.java b/fabric/mc1202/src/main/java/io/github/retrooper/packetevents/mc1202/factory/fabric/Fabric1202ServerPlayerManager.java
@@ -21,6 +21,7 @@
 import com.github.retrooper.packetevents.PacketEventsAPI;
 import io.github.retrooper.packetevents.mc1140.factory.fabric.Fabric1140ServerPlayerManager;
 import net.minecraft.server.network.ServerPlayerEntity;
+import net.minecraft.text.Text;
 import org.jetbrains.annotations.NotNull;
 
 public class Fabric1202ServerPlayerManager extends Fabric1140ServerPlayerManager {
@@ -44,4 +45,10 @@ public Object getChannel(@NotNull Object player) {
         }
         throw new UnsupportedOperationException("Unsupported player implementation: " + player);
     }
+
+    // disconnect method moved from ServerPlayNetworkHandler -> ServerCommonNetworkHandler in 1.20.2
+    @Override
+    public void disconnectPlayer(ServerPlayerEntity serverPlayerEntity, String message) {
+        serverPlayerEntity.networkHandler.disconnect(Text.literal(message));
+    }
 }
diff --git a/fabric/src/main/java/io/github/retrooper/packetevents/factory/fabric/FabricPacketEventsAPI.java b/fabric/src/main/java/io/github/retrooper/packetevents/factory/fabric/FabricPacketEventsAPI.java
@@ -33,6 +33,7 @@
 import com.github.retrooper.packetevents.util.LogManager;
 import io.github.retrooper.packetevents.PacketEventsMod;
 import io.github.retrooper.packetevents.impl.netty.NettyManagerImpl;
+import io.github.retrooper.packetevents.manager.AbstractFabricPlayerManager;
 import io.github.retrooper.packetevents.manager.FabricLogger;
 import io.github.retrooper.packetevents.manager.FabricProtocolManager;
 import io.github.retrooper.packetevents.manager.FabricServerManager;
@@ -174,7 +175,7 @@ public LogManager getLogManager() {
     }
 
     @Override
-    public PlayerManager getPlayerManager() {
+    public AbstractFabricPlayerManager getPlayerManager() {
         return this.environment == EnvType.SERVER ? FabricPacketEventsAPIManagerFactory.getLazyPlayerManagerHolder().get() : FabricPacketEventsAPIManagerFactory.getClientLazyPlayerManagerHolder().get();
     }
 
diff --git a/fabric/src/main/java/io/github/retrooper/packetevents/factory/fabric/FabricPacketEventsAPIManagerFactory.java b/fabric/src/main/java/io/github/retrooper/packetevents/factory/fabric/FabricPacketEventsAPIManagerFactory.java
@@ -1,22 +1,23 @@
 package io.github.retrooper.packetevents.factory.fabric;
 
 import com.github.retrooper.packetevents.manager.registry.RegistryManager;
+import io.github.retrooper.packetevents.manager.AbstractFabricPlayerManager;
 import io.github.retrooper.packetevents.util.LazyHolder;
 import io.github.retrooper.packetevents.impl.netty.manager.player.PlayerManagerAbstract;
 import io.github.retrooper.packetevents.loader.ChainLoadData;
 
 public class FabricPacketEventsAPIManagerFactory {
     // TODO, refactor if booky and retrooper approve, bad design having settable static field
     // exists to maintain 100% backward compatability
-    private static LazyHolder<PlayerManagerAbstract> lazyPlayerManagerHolder = () -> null;
-    private static LazyHolder<PlayerManagerAbstract> lazyClientPlayerManagerHolder = () -> null;
+    private static LazyHolder<AbstractFabricPlayerManager> lazyPlayerManagerHolder = () -> null;
+    private static LazyHolder<AbstractFabricPlayerManager> lazyClientPlayerManagerHolder = () -> null;
     private static LazyHolder<RegistryManager> registryManagerLazyHolder = () -> null;
 
-    public static LazyHolder<PlayerManagerAbstract> getLazyPlayerManagerHolder() {
+    public static LazyHolder<AbstractFabricPlayerManager> getLazyPlayerManagerHolder() {
         return lazyPlayerManagerHolder;
     }
 
-    public static LazyHolder<PlayerManagerAbstract> getClientLazyPlayerManagerHolder() {
+    public static LazyHolder<AbstractFabricPlayerManager> getClientLazyPlayerManagerHolder() {
         return lazyClientPlayerManagerHolder;
     }
 
diff --git a/fabric/src/main/java/io/github/retrooper/packetevents/handler/PacketEncoder.java b/fabric/src/main/java/io/github/retrooper/packetevents/handler/PacketEncoder.java
@@ -33,6 +33,7 @@
 import com.github.retrooper.packetevents.util.ExceptionUtil;
 import com.github.retrooper.packetevents.util.PacketEventsImplHelper;
 import com.github.retrooper.packetevents.wrapper.play.server.WrapperPlayServerDisconnect;
+import io.github.retrooper.packetevents.factory.fabric.FabricPacketEventsAPI;
 import io.github.retrooper.packetevents.util.FabricCustomPipelineUtil;
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.ChannelHandler;
@@ -177,8 +178,7 @@ public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws E
                 if (player instanceof ServerPlayerEntity serverPlayer) {
                     // Schedule delayed kick (Fabric-specific, using Minecraft's scheduler)
                     serverPlayer.getServer().execute(() -> {
-//                        serverPlayer.connection.disconnect(Component.literal("Invalid packet"));
-                        serverPlayer.networkHandler.disconnect(new TextComponent("Invalid packet"));
+                        FabricPacketEventsAPI.getServerAPI().getPlayerManager().disconnectPlayer(serverPlayer, "Invalid packet");
                     });
                 }
 
diff --git a/fabric/src/main/java/io/github/retrooper/packetevents/loader/ChainLoadData.java b/fabric/src/main/java/io/github/retrooper/packetevents/loader/ChainLoadData.java
@@ -1,14 +1,15 @@
 package io.github.retrooper.packetevents.loader;
 
 import com.github.retrooper.packetevents.manager.registry.RegistryManager;
+import io.github.retrooper.packetevents.manager.AbstractFabricPlayerManager;
 import io.github.retrooper.packetevents.util.LazyHolder;
 import io.github.retrooper.packetevents.impl.netty.manager.player.PlayerManagerAbstract;
 
 public class ChainLoadData {
 
     private LazyHolder<RegistryManager> registryManagerLazyHolder = null;
-    private LazyHolder<PlayerManagerAbstract> playerManagerAbstractLazyHolder = null;
-    private LazyHolder<PlayerManagerAbstract> clientPlayerManagerAbstractLazyHolder = null;
+    private LazyHolder<AbstractFabricPlayerManager> playerManagerAbstractLazyHolder = null;
+    private LazyHolder<AbstractFabricPlayerManager> clientPlayerManagerAbstractLazyHolder = null;
 
     public void setRegistryManagerIfNull(LazyHolder<RegistryManager> registryManagerLazyHolder) {
         if (this.registryManagerLazyHolder == null) {
@@ -20,23 +21,23 @@ public LazyHolder<RegistryManager> getRegistryManagerLazyHolder() {
         return this.registryManagerLazyHolder;
     }
 
-    public void setPlayerManagerIfNull(LazyHolder<PlayerManagerAbstract> playerManagerAbstractLazyHolder) {
+    public void setPlayerManagerIfNull(LazyHolder<AbstractFabricPlayerManager> playerManagerAbstractLazyHolder) {
         if (this.playerManagerAbstractLazyHolder == null) {
             this.playerManagerAbstractLazyHolder = playerManagerAbstractLazyHolder;
         }
     }
 
-    public LazyHolder<PlayerManagerAbstract> getPlayerManagerAbstractLazyHolder() {
+    public LazyHolder<AbstractFabricPlayerManager> getPlayerManagerAbstractLazyHolder() {
         return this.playerManagerAbstractLazyHolder;
     }
 
-    public void setClientPlayerManagerIfNull(LazyHolder<PlayerManagerAbstract> clientPlayerManagerAbstractLazyHolder) {
+    public void setClientPlayerManagerIfNull(LazyHolder<AbstractFabricPlayerManager> clientPlayerManagerAbstractLazyHolder) {
         if (this.clientPlayerManagerAbstractLazyHolder == null) {
             this.clientPlayerManagerAbstractLazyHolder = clientPlayerManagerAbstractLazyHolder;
         }
     }
 
-    public LazyHolder<PlayerManagerAbstract> getClientPlayerManagerAbstractLazyHolder() {
+    public LazyHolder<AbstractFabricPlayerManager> getClientPlayerManagerAbstractLazyHolder() {
         return this.clientPlayerManagerAbstractLazyHolder;
     }
 }
diff --git a/fabric/src/main/java/io/github/retrooper/packetevents/manager/AbstractFabricPlayerManager.java b/fabric/src/main/java/io/github/retrooper/packetevents/manager/AbstractFabricPlayerManager.java
@@ -4,6 +4,8 @@
 import com.github.retrooper.packetevents.protocol.ConnectionState;
 import com.github.retrooper.packetevents.wrapper.PacketWrapper;
 import io.github.retrooper.packetevents.impl.netty.manager.player.PlayerManagerAbstract;
+import net.minecraft.network.chat.Component;
+import net.minecraft.server.network.ServerPlayerEntity;
 import org.jetbrains.annotations.NotNull;
 
 public abstract class AbstractFabricPlayerManager extends PlayerManagerAbstract {
@@ -77,4 +79,6 @@ public void receivePacketSilently(Object player, Object byteBuf) {
     public void receivePacketSilently(Object player, PacketWrapper<?> wrapper) {
         packetEventsAPI.getProtocolManager().receivePacketSilently(getChannel(player), wrapper);
     }
+
+    public abstract void disconnectPlayer(ServerPlayerEntity serverPlayerEntity, String message);
 }
diff --git a/fabric/src/main/java/io/github/retrooper/packetevents/manager/FabricServerManager.java b/fabric/src/main/java/io/github/retrooper/packetevents/manager/FabricServerManager.java
@@ -24,13 +24,13 @@
 import com.github.retrooper.packetevents.util.mappings.GlobalRegistryHolder;
 import io.github.retrooper.packetevents.impl.netty.manager.server.ServerManagerAbstract;
 import net.fabricmc.loader.api.FabricLoader;
-import net.minecraft.SharedConstants;
 
 public class FabricServerManager extends ServerManagerAbstract {
 
-    private ServerVersion version;
+    // Its ok for this to be static, client and server version running PE will always be the same even on integrated server
+    private static ServerVersion version;
 
-    private ServerVersion resolveVersion() {
+    private static ServerVersion resolveVersion() {
         String mcVersion = FabricLoader.getInstance().getModContainer("minecraft")
                 .flatMap(mod -> mod.getMetadata().getVersion().getFriendlyString().describeConstable())
                 .orElse("unknown");
@@ -45,10 +45,14 @@ private ServerVersion resolveVersion() {
 
     @Override
     public ServerVersion getVersion() {
-        if (this.version == null) {
-            this.version = this.resolveVersion();
+        return getVersionStatically();
+    }
+
+    public static ServerVersion getVersionStatically() {
+        if (version == null) {
+            version = resolveVersion();
         }
-        return this.version;
+        return version;
     }
 
     @Override
diff --git a/fabric/src/main/java/io/github/retrooper/packetevents/util/FabricInjectionUtil.java b/fabric/src/main/java/io/github/retrooper/packetevents/util/FabricInjectionUtil.java
@@ -112,7 +112,7 @@ public static void fireUserLoginEvent(ServerPlayerEntity player) {
                     (!api.isTerminated() || api.getSettings().isKickIfTerminated())) {
                 // Kick the player if they're not a fake player
                 // player.connection.disconnect(Component.literal("PacketEvents 2.0 failed to inject"));
-                player.networkHandler.disconnect(new TextComponent("PacketEvents 2.0 failed to inject"));
+                FabricPacketEventsAPI.getServerAPI().getPlayerManager().disconnectPlayer(player, "PacketEvents 2.0 failed to inject");
             }
             return;
         }

Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,7 @@`
`20`	`20`
`21`	`21`	`import com.github.retrooper.packetevents.PacketEventsAPI;`
`22`	`22`	`import io.github.retrooper.packetevents.manager.AbstractFabricPlayerManager;`
	`23`	`+import net.minecraft.network.chat.TextComponent;`
`23`	`24`	`import net.minecraft.server.network.ServerPlayerEntity;`
`24`	`25`	`import org.jetbrains.annotations.NotNull;`
`25`	`26`
`@@ -44,4 +45,9 @@ public Object getChannel(@NotNull Object player) {`
`44`	`45`	`}`
`45`	`46`	`throw new UnsupportedOperationException("Unsupported player implementation: " + player);`
`46`	`47`	`}`
	`48`	`+`
	`49`	`+ @Override`
	`50`	`+ public void disconnectPlayer(ServerPlayerEntity serverPlayerEntity, String message) {`
	`51`	`+ serverPlayerEntity.networkHandler.disconnect(new TextComponent(message));`
	`52`	`+ }`
`47`	`53`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@ repositories {`
`6`	`6`	`}`
`7`	`7`
`8`	`8`	`dependencies {`
	`9`	`+ compileOnly(project(":fabric:mc1140", configuration = "namedElements"))`
`9`	`10`	`// To change the versions, see the gradle.properties file`
`10`	`11`	`minecraft("com.mojang:minecraft:$minecraft_version")`
`11`	`12`	`mappings("net.fabricmc:yarn:$yarn_mappings")`
Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,7 @@`
`21`	`21`	`import com.github.retrooper.packetevents.PacketEventsAPI;`
`22`	`22`	`import io.github.retrooper.packetevents.mc1140.factory.fabric.Fabric1140ServerPlayerManager;`
`23`	`23`	`import net.minecraft.server.network.ServerPlayerEntity;`
	`24`	`+import net.minecraft.text.Text;`
`24`	`25`	`import org.jetbrains.annotations.NotNull;`
`25`	`26`
`26`	`27`	`public class Fabric1202ServerPlayerManager extends Fabric1140ServerPlayerManager {`
`@@ -44,4 +45,10 @@ public Object getChannel(@NotNull Object player) {`
`44`	`45`	`}`
`45`	`46`	`throw new UnsupportedOperationException("Unsupported player implementation: " + player);`
`46`	`47`	`}`
	`48`	`+`
	`49`	`+ // disconnect method moved from ServerPlayNetworkHandler -> ServerCommonNetworkHandler in 1.20.2`
	`50`	`+ @Override`
	`51`	`+ public void disconnectPlayer(ServerPlayerEntity serverPlayerEntity, String message) {`
	`52`	`+ serverPlayerEntity.networkHandler.disconnect(Text.literal(message));`
	`53`	`+ }`
`47`	`54`	`}`
Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,7 @@`
`33`	`33`	`import com.github.retrooper.packetevents.util.LogManager;`
`34`	`34`	`import io.github.retrooper.packetevents.PacketEventsMod;`
`35`	`35`	`import io.github.retrooper.packetevents.impl.netty.NettyManagerImpl;`
	`36`	`+import io.github.retrooper.packetevents.manager.AbstractFabricPlayerManager;`
`36`	`37`	`import io.github.retrooper.packetevents.manager.FabricLogger;`
`37`	`38`	`import io.github.retrooper.packetevents.manager.FabricProtocolManager;`
`38`	`39`	`import io.github.retrooper.packetevents.manager.FabricServerManager;`
`@@ -174,7 +175,7 @@ public LogManager getLogManager() {`
`174`	`175`	`}`
`175`	`176`
`176`	`177`	`@Override`
`177`		`- public PlayerManager getPlayerManager() {`
	`178`	`+ public AbstractFabricPlayerManager getPlayerManager() {`
`178`	`179`	`return this.environment == EnvType.SERVER ? FabricPacketEventsAPIManagerFactory.getLazyPlayerManagerHolder().get() : FabricPacketEventsAPIManagerFactory.getClientLazyPlayerManagerHolder().get();`
`179`	`180`	`}`
`180`	`181`