Merge branch 'master' into 1.16

src/main/java/carpet/mixins/ServerPlayNetworkHandler_antiCheatDisabledMixin.java

@@ -22,10 +22,6 @@ public abstract class ServerPlayNetworkHandler_antiCheatDisabledMixin
 
     @Shadow protected abstract boolean isServerOwner();
 
-    @Shadow @Final public ClientConnection client;
-
-    @Shadow public ServerPlayerEntity player;
-
     @Inject(method = "tick", at = @At("HEAD"))
     private void restrictFloatingBits(CallbackInfo ci)
     {