Fix Mixin conflict with C2ME (Closes #1597).

Signed-off-by: 秋雨落 <[email protected]>
IzzelAliz · Dec 30, 2024 · 320a09a · 320a09a
1 parent d1be1ea
commit 320a09a
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/...src/main/java/io/izzel/arclight/common/mixin/core/server/level/ServerChunkCacheMixin.java b/...src/main/java/io/izzel/arclight/common/mixin/core/server/level/ServerChunkCacheMixin.java
@@ -5,6 +5,7 @@
 import io.izzel.arclight.common.bridge.core.world.server.ChunkMapBridge;
 import io.izzel.arclight.common.bridge.core.world.server.ServerChunkProviderBridge;
 import io.izzel.arclight.common.bridge.core.world.server.TicketManagerBridge;
+import io.izzel.arclight.mixin.Local;
 import net.minecraft.server.level.*;
 import net.minecraft.world.level.ChunkPos;
 import net.minecraft.world.level.GameRules;
@@ -17,9 +18,8 @@
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.gen.Accessor;
 import org.spongepowered.asm.mixin.gen.Invoker;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.ModifyVariable;
-import org.spongepowered.asm.mixin.injection.Redirect;
+import org.spongepowered.asm.mixin.injection.*;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 import javax.annotation.Nullable;
 import java.io.IOException;
@@ -123,8 +123,9 @@ public void purgeUnload() {
         this.purgeUnload();
     }
 
-    @Redirect(method = "chunkAbsent", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/level/ChunkHolder;getTicketLevel()I"))
+    @Redirect(method = "chunkAbsent", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/level/ChunkHolder;getTicketLevel()I"), require = 0)
     public int arclight$useOldTicketLevel(ChunkHolder chunkHolder) {
+        // XXX: Disable for C2ME (#1597)
         return ((ChunkHolderBridge) chunkHolder).bridge$getOldTicketLevel();
     }
 }