Fix whitelist check not being executed

Erdragh · Dec 1, 2023 · 56db912 · 56db912
1 parent 208ab60
commit 56db912
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git a/common/src/main/java/dev/erdragh/astralbot/mixins/DedicatedPlayerListMixin.java b/common/src/main/java/dev/erdragh/astralbot/mixins/DedicatedPlayerListMixin.java
@@ -0,0 +1,16 @@
+package dev.erdragh.astralbot.mixins;
+
+import com.mojang.authlib.GameProfile;
+import dev.erdragh.astralbot.handlers.WhitelistHandler;
+import net.minecraft.server.dedicated.DedicatedPlayerList;
+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.CallbackInfoReturnable;
+
+@Mixin(DedicatedPlayerList.class)
+public class DedicatedPlayerListMixin {  @Inject(method = "isWhiteListed", at = @At("RETURN"), cancellable = true)
+    void astralbot$isWhiteListed(GameProfile profile, CallbackInfoReturnable<Boolean> cir) {
+        cir.setReturnValue(Boolean.TRUE.equals(cir.getReturnValue()) || WhitelistHandler.INSTANCE.checkWhitelist(profile.getId()) != null);
+    }
+}
diff --git a/common/src/main/resources/astralbot-common.mixins.json b/common/src/main/resources/astralbot-common.mixins.json
@@ -4,7 +4,8 @@
   "package": "dev.erdragh.astralbot.mixins",
   "compatibilityLevel": "JAVA_17",
   "server": [
-    "PlayerListMixin"
+    "PlayerListMixin",
+    "DedicatedPlayerListMixin"
   ],
   "injectors": {
     "defaultRequire": 1