Merge branch 'master' into 1.16

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

@@ -9,6 +9,8 @@ import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
+import static carpet.script.CarpetEventServer.Event.PLAYER_CONNECTS;
+
 @Mixin(PlayerManager.class)
 public class PlayerManager_coreMixin
 {
@@ -16,5 +18,6 @@ public class PlayerManager_coreMixin
     private void onPlayerConnected(ClientConnection connection, ServerPlayerEntity player, CallbackInfo ci)
     {
         CarpetServer.onPlayerLoggedIn(player);
+        PLAYER_CONNECTS.onPlayerEvent(player);
     }
 }

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

@@ -13,6 +13,8 @@ import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
+import static carpet.script.CarpetEventServer.Event.PLAYER_DISCONNECTS;
+
 @Mixin(ServerPlayNetworkHandler.class)
 public class ServerPlayNetworkHandler_coreMixin {
     @Shadow
@@ -21,5 +23,6 @@ public class ServerPlayNetworkHandler_coreMixin {
     @Inject(method = "onDisconnected", at = @At("HEAD"))
     private void onPlayerDisconnect(Text reason, CallbackInfo ci) {
         CarpetServer.onPlayerLoggedOut(this.player);
+        if (PLAYER_DISCONNECTS.isNeeded()) PLAYER_DISCONNECTS.onPlayerMessage(player, reason.asString());
     }
 }