Fixed #202

MohistMC · Feb 1, 2024 · d32a798 · d32a798
1 parent 885e908
commit d32a798
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/src/main/java/com/mohistmc/banner/mixin/server/level/MixinServerLevel.java b/src/main/java/com/mohistmc/banner/mixin/server/level/MixinServerLevel.java
@@ -258,11 +258,6 @@ public <T extends ParticleOptions> int sendParticles(ServerPlayer sender, T t0,
         return strikeLightning(entityIn, LightningStrikeEvent.Cause.WEATHER);
     }
 
-    @Redirect(method = "tickChunk", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/level/ServerLevel;isThundering()Z"))
-    private boolean banner$thunderChance(ServerLevel instance) {
-        return this.isRaining() && this.isThundering() && this.bridge$spigotConfig().thunderChance > 0;
-    }
-
     @ModifyConstant(method = "tickChunk", constant = @Constant(intValue = 100000))
     private int banner$configChane(int constant) {
         return this.bridge$spigotConfig().thunderChance;

diff --git a/src/main/java/com/mohistmc/banner/mixin/world/level/MixinLevel.java b/src/main/java/com/mohistmc/banner/mixin/world/level/MixinLevel.java
@@ -384,6 +384,13 @@ public void notifyAndUpdatePhysics(BlockPos blockposition, LevelChunk chunk, Blo
         // CraftBukkit end
     }
 
+    @Inject(method = "isThundering", at = @At("HEAD"), cancellable = true)
+    private void banner$isThundering(CallbackInfoReturnable<Boolean> cir) {
+        if (spigotConfig != null && spigotConfig.thunderChance <= 0) {
+            cir.setReturnValue(false);
+        }
+    }
+
     @Inject(method = "setBlockEntity",
             at = @At(value = "INVOKE",
             target = "Lnet/minecraft/world/level/Level;getChunkAt(Lnet/minecraft/core/BlockPos;)Lnet/minecraft/world/level/chunk/LevelChunk;",