From 17c2d601d2486e2479288a7199e8f66b38c6487b Mon Sep 17 00:00:00 2001
From: altrisi <altrisi.trillosierra@gmail.com>
Date: Sat, 8 Apr 2023 19:48:52 +0200
Subject: [PATCH] Remove global server reference from
 `Player_antiCheatDisabledMixin`

---
 .../java/carpet/mixins/Player_antiCheatDisabledMixin.java     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/carpet/mixins/Player_antiCheatDisabledMixin.java b/src/main/java/carpet/mixins/Player_antiCheatDisabledMixin.java
index 621f7f4d..8a9625dc 100644
--- a/src/main/java/carpet/mixins/Player_antiCheatDisabledMixin.java
+++ b/src/main/java/carpet/mixins/Player_antiCheatDisabledMixin.java
@@ -1,7 +1,7 @@
 package carpet.mixins;
 
-import carpet.CarpetServer;
 import carpet.CarpetSettings;
+import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.world.entity.EquipmentSlot;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.item.ElytraItem;
@@ -23,7 +23,7 @@ public abstract class Player_antiCheatDisabledMixin
     @Inject(method = "tryToStartFallFlying", at = @At("HEAD"), cancellable = true)
     private void allowDeploys(CallbackInfoReturnable<Boolean> cir)
     {
-        if (CarpetSettings.antiCheatDisabled && CarpetServer.minecraft_server != null && CarpetServer.minecraft_server.isDedicatedServer())
+        if (CarpetSettings.antiCheatDisabled && (Object)this instanceof ServerPlayer sp && sp.getServer().isDedicatedServer())
         {
             ItemStack itemStack_1 = getItemBySlot(EquipmentSlot.CHEST);
             if (itemStack_1.getItem() == Items.ELYTRA && ElytraItem.isFlyEnabled(itemStack_1)) {