Merge branch 'master' into 1.16

src/main/java/carpet/mixins/PlayerManager_coreMixin.java

@@ -0,0 +1,20 @@
+package carpet.mixins;
+
+import carpet.CarpetServer;
+import net.minecraft.network.ClientConnection;
+import net.minecraft.server.PlayerManager;
+import net.minecraft.server.network.ServerPlayerEntity;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+@Mixin(PlayerManager.class)
+public class PlayerManager_coreMixin
+{
+    @Inject(method = "onPlayerConnect", at = @At("RETURN"))
+    private void onPlayerConnected(ClientConnection connection, ServerPlayerEntity player, CallbackInfo ci)
+    {
+        CarpetServer.onPlayerLoggedIn(player);
+    }
+}

src/main/java/carpet/mixins/PlayerManager_fakePlayersMixin.java

@@ -24,7 +24,7 @@ import java.util.List;
 import java.util.UUID;
 
 @Mixin(PlayerManager.class)
-public abstract class PlayerManagerMixin
+public abstract class PlayerManager_fakePlayersMixin
 {
     @Shadow
     @Final

src/main/java/carpet/mixins/ServerPlayNetworkHandler_coreMixin.java

@@ -18,11 +18,6 @@ public class ServerPlayNetworkHandler_coreMixin {
     @Shadow
     public ServerPlayerEntity player;
 
-    @Inject(method = "<init>", at = @At("RETURN"))
-    private void onPlayerConnect(MinecraftServer server, ClientConnection client, ServerPlayerEntity player, CallbackInfo ci) {
-        CarpetServer.onPlayerLoggedIn(player);
-    }
-
     @Inject(method = "onDisconnected", at = @At("HEAD"))
     private void onPlayerDisconnect(Text reason, CallbackInfo ci) {
         CarpetServer.onPlayerLoggedOut(this.player);