From eb3550512d0928be2e89d0ede8290fe6e03c2517 Mon Sep 17 00:00:00 2001
From: ChomeNS <95471003+chomens@users.noreply.github.com>
Date: Sat, 20 Dec 2025 12:39:58 +0700
Subject: [PATCH] fix: op self care

---
 src/main/java/land/chipmunk/chipmunkmod/modules/SelfCare.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/land/chipmunk/chipmunkmod/modules/SelfCare.java b/src/main/java/land/chipmunk/chipmunkmod/modules/SelfCare.java
index 526e227..0cd3196 100644
--- a/src/main/java/land/chipmunk/chipmunkmod/modules/SelfCare.java
+++ b/src/main/java/land/chipmunk/chipmunkmod/modules/SelfCare.java
@@ -6,6 +6,7 @@ import land.chipmunk.chipmunkmod.listeners.ListenerManager;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.network.ClientPlayNetworkHandler;
 import net.minecraft.client.network.ClientPlayerEntity;
+import net.minecraft.command.DefaultPermissions;
 import net.minecraft.network.packet.c2s.play.ChangeGameModeC2SPacket;
 import net.minecraft.text.Text;
 import net.minecraft.world.GameMode;
@@ -59,7 +60,7 @@ public class SelfCare implements Listener {
 
         if (networkHandler == null || player == null) return;
 
-        if (!player.isCreativeLevelTwoOp() && opEnabled && serverHasCommand("op"))
+        if (!player.getPermissions().hasPermission(DefaultPermissions.OWNERS) && opEnabled && serverHasCommand("op"))
             networkHandler.sendChatCommand("op @s[type=player]");
         else if (!player.isInCreativeMode() && gamemodeEnabled)
             // ViaVersion will automatically convert this to `/gamemode creative`
@@ -68,7 +69,6 @@ public class SelfCare implements Listener {
             if (
                     !CommandCore.INSTANCE.ready
                             || !CommandCore.INSTANCE.runFillCommand
-                            || !player.isInCreativeMode()
                             || !player.isCreativeLevelTwoOp()
             ) {
                 networkHandler.sendChatCommand("c on");