💩

Minecraft-AMS · Sep 9, 2024 · ffab3a0 · ffab3a0
1 parent 050257a
commit ffab3a0
Showing 1 changed file with 25 additions and 11 deletions.
diff --git a/.../java/club/mcams/carpet/mixin/rule/preventEndSpikeRespawn/EnderDragonSpawnStateMixin.java b/.../java/club/mcams/carpet/mixin/rule/preventEndSpikeRespawn/EnderDragonSpawnStateMixin.java
@@ -51,34 +51,48 @@ private boolean onRemoveBlock(ServerWorld serverWorld, BlockPos blockPos, boolea
         return Objects.equals(AmsServerSettings.preventEndSpikeRespawn, "false") ? original.call(serverWorld, blockPos, b) : false;
     }
 
-    // TODO: 不知道为什么注入点认不到，先摆
-    //#if MC<12102
     @WrapOperation(
         method = "run",
         at = @At(
             value = "INVOKE",
-            target =
             //#if MC>=12102
-            //$$ "Lnet/minecraft/server/world/ServerWorld;createExplosion(Lnet/minecraft/entity/Entity;DDDFLnet/minecraft/world/World$ExplosionSourceType;)V"
-            //#elseif MC>11904
-            //$$ "Lnet/minecraft/server/world/ServerWorld;createExplosion(Lnet/minecraft/entity/Entity;DDDFLnet/minecraft/world/World$ExplosionSourceType;)Lnet/minecraft/world/explosion/Explosion;"
+            //$$ target = "Lnet/minecraft/server/world/ServerWorld;createExplosion(Lnet/minecraft/entity/Entity;DDDFLnet/minecraft/world/World$ExplosionSourceType;)V"
+            //#elseif MC>=11904
+            //$$ target = "Lnet/minecraft/server/world/ServerWorld;createExplosion(Lnet/minecraft/entity/Entity;DDDFLnet/minecraft/world/World$ExplosionSourceType;)Lnet/minecraft/world/explosion/Explosion;"
             //#else
-            "Lnet/minecraft/server/world/ServerWorld;createExplosion(Lnet/minecraft/entity/Entity;DDDFLnet/minecraft/world/explosion/Explosion$DestructionType;)Lnet/minecraft/world/explosion/Explosion;"
+            target = "Lnet/minecraft/server/world/ServerWorld;createExplosion(Lnet/minecraft/entity/Entity;DDDFLnet/minecraft/world/explosion/Explosion$DestructionType;)Lnet/minecraft/world/explosion/Explosion;"
             //#endif
         )
     )
+    //#if MC>=12102
+    //$$ private void onCreateExplosion(
+    //#else
     private Explosion onCreateExplosion(
+    //#endif
         ServerWorld serverWorld,
         Entity entity,
         double x, double y, double z, float power,
-        //#if MC>=12000
-        //$$ World.ExplosionSourceType destructionType,
-        //#else
+
+        //#if MC<11904
         Explosion.DestructionType destructionType,
+        //#else
+        //$$ World.ExplosionSourceType destructionType,
         //#endif
+
+        //#if MC>=12102
+        //$$ Operation<Void> original
+        //#else
         Operation<Explosion> original
+        //#endif
     ) {
+        //#if MC<12102
         return Objects.equals(AmsServerSettings.preventEndSpikeRespawn, "false") ? original.call(serverWorld, entity, x, y, z, power, destructionType) : null;
+        //#else
+        //$$ if (Objects.equals(AmsServerSettings.preventEndSpikeRespawn, "false")) {
+        //$$     original.call(serverWorld, entity, x, y, z, power, destructionType);
+        //$$ } else {
+        //$$     serverWorld.createExplosion(null, 0, 0, 0, 0.0F, World.ExplosionSourceType.NONE);
+        //$$ }
+        //#endif
     }
-    //#endif
 }