🐛 修复由 opPlayerNoCheatExtra 引起的游戏崩溃问题

Minecraft-AMS · Nov 11, 2023 · 451e634 · 451e634
1 parent 37de74a
commit 451e634
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/src/main/java/club/mcams/carpet/mixin/rule/opPlayerNoCheatExtra/DataCommandMixin.java b/src/main/java/club/mcams/carpet/mixin/rule/opPlayerNoCheatExtra/DataCommandMixin.java
@@ -38,12 +38,14 @@ private static void executeGet(CallbackInfoReturnable<Integer> cir) {
         }
     }
 
+    //#if MC<11900
     @Inject(method = "executeInsert", at = @At("HEAD"))
     private static void executeInsert(CallbackInfoReturnable<Integer> cir) {
         if (AmsServerSettings.opPlayerNoCheatExtra) {
             cir.cancel();
         }
     }
+    //#endif
 
     @Inject(method = "executeMerge", at = @At("HEAD"))
     private static void executeMerge(CallbackInfoReturnable<Integer> cir) {

diff --git a/src/main/java/club/mcams/carpet/mixin/rule/opPlayerNoCheatExtra/EffectCommandMixin.java b/src/main/java/club/mcams/carpet/mixin/rule/opPlayerNoCheatExtra/EffectCommandMixin.java
@@ -31,7 +31,11 @@
 
 @Mixin(EffectCommand.class)
 public abstract class EffectCommandMixin {
+    //#if MC<11900
     @Inject(method = "executeClear(Lnet/minecraft/server/command/ServerCommandSource;Ljava/util/Collection;Lnet/minecraft/entity/effect/StatusEffect;)I", at = @At("HEAD"))
+    //#else
+    //$$ @Inject(method = "executeClear(Lnet/minecraft/server/command/ServerCommandSource;Ljava/util/Collection;Lnet/minecraft/registry/entry/RegistryEntry;)I", at = @At("HEAD"))
+    //#endif
     private static void executeClear1(CallbackInfoReturnable<Integer> cir) {
         if (AmsServerSettings.opPlayerNoCheatExtra) {
             cir.cancel();