修复: optimizedDragonRespawn 导致的游戏崩溃 #27

Minecraft-AMS · Jun 12, 2023 · 40d2fc1 · 40d2fc1
1 parent b7676da
commit 40d2fc1
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 3 deletions.
diff --git a/...izedDragonRespawn/BlockPatternHelper.java → ...s/carpet/function/BlockPatternHelper.java b/...izedDragonRespawn/BlockPatternHelper.java → ...s/carpet/function/BlockPatternHelper.java
@@ -1,4 +1,6 @@
-package club.mcams.carpet.mixin.rule.optimizedDragonRespawn;
+package club.mcams.carpet.function;
+
+import club.mcams.carpet.mixin.rule.optimizedDragonRespawn.BlockPatternTestTransformInvoker;
 
 import com.google.common.cache.LoadingCache;
 
@@ -7,6 +9,7 @@
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Direction;
 import net.minecraft.world.WorldView;
+
 public class BlockPatternHelper {
     public static BlockPattern.Result partialSearchAround(BlockPattern pattern, WorldView world, BlockPos pos) {
         LoadingCache<BlockPos, CachedBlockPosition> loadingCache = BlockPattern.makeCache(world, false);

diff --git a/...club/mcams/carpet/mixin/rule/optimizedDragonRespawn/BlockPatternTestTransformInvoker.java b/...club/mcams/carpet/mixin/rule/optimizedDragonRespawn/BlockPatternTestTransformInvoker.java
@@ -9,6 +9,7 @@
 
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Invoker;
+
 @Mixin(BlockPattern.class)
 public interface BlockPatternTestTransformInvoker {
     @Invoker("testTransform")

diff --git a/src/main/java/club/mcams/carpet/mixin/rule/optimizedDragonRespawn/EnderDragonFightMixin.java b/src/main/java/club/mcams/carpet/mixin/rule/optimizedDragonRespawn/EnderDragonFightMixin.java
@@ -1,6 +1,7 @@
 package club.mcams.carpet.mixin.rule.optimizedDragonRespawn;
 
 import club.mcams.carpet.AmsServerSettings;
+import club.mcams.carpet.function.BlockPatternHelper;
 
 import net.minecraft.block.entity.BlockEntity;
 import net.minecraft.block.entity.EndGatewayBlockEntity;
@@ -90,7 +91,7 @@ public abstract class EnderDragonFightMixin {
                 if(AmsServerSettings.optimizedDragonRespawn && notFirstSearch) {
                     //#if MC>=12000
                     //&& result2 = BlockPatternHelper.partialSearchAround(this.endPortalPattern, this.world, new BlockPos(EndPortalFeature.offsetOrigin(BlockPos.ORIGIN)).getY();, j, EndPortalFeature.offsetOrigin(BlockPos.ORIGIN).getZ()));
-                    //#elseORIGIN
+                    //#else
                     result2 = BlockPatternHelper.partialSearchAround(this.endPortalPattern, this.world, new BlockPos(EndPortalFeature.ORIGIN.getX(), j, EndPortalFeature.ORIGIN.getZ()));
                     //#endif
                 }

diff --git a/src/main/resources/amscarpet.mixins.json b/src/main/resources/amscarpet.mixins.json
@@ -6,6 +6,7 @@
   "mixins": [
     "carpet.SettingsManagerMixin",
     "interaction.ThreadedAnvilChunkStorageMixin",
+    "rule.antiFireTotem_itemAntiExplosion.ItemEntityMixin",
     "rule.bambooCollisionBoxDisable.BambooBlockMixin",
     "rule.bambooModelNoOffset.BambooBlockMixin",
     "rule.blockChunkLoader.BellBlockMixin",
@@ -35,7 +36,6 @@
     "rule.sharedVillagerDiscounts.VillagerGossipsMixin",
     "rule.softBlock.AbstractBlockStateMixin",
     "rule.superBow.InfinityEnchantmentMixin",
-    "rule.antiFireTotem_itemAntiExplosion.ItemEntityMixin",
     "rule.weakBlocks.CollectBlocksAndDamageEntitiesMixin"
   ],
   "client": [],