fix some bugs and bump version

augustresende · Oct 28, 2020 · 4f47505 · 4f47505
1 parent 87df4bf
commit 4f47505
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 2 deletions.
diff --git a/changelog.txt b/changelog.txt
@@ -1,3 +1,7 @@
+This version (0.2.5) fix some bugs when the mod runs with custom world generation settings.
+
+===============================================================================
+
 This version (0.2.4) fix another weird bug that crashes on Server Fabric version.
 
 ===============================================================================

diff --git a/...a/com/vanilla/experience/fabric/zerotickunpatch/mixin/ZeroTickAbstractPlantPartBlock.java b/...a/com/vanilla/experience/fabric/zerotickunpatch/mixin/ZeroTickAbstractPlantPartBlock.java
@@ -24,6 +24,11 @@ public ZeroTickAbstractPlantPartBlock(Settings settings) {
 
     @Inject(at = @At("TAIL"), method = "scheduledTick(Lnet/minecraft/block/BlockState;Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/util/math/BlockPos;Ljava/util/Random;)V")
     public void scheduledTick(final BlockState state, final ServerWorld world, final BlockPos pos, final Random random, CallbackInfo info) {
+        if (!state.canPlaceAt(world, pos)) {
+            world.breakBlock(pos, true);
+            return;
+        }
+
         if(!world.isAir(pos.down())) {
             this.randomTick(state, world, pos, random);
         }

diff --git a/forge/gradle.properties b/forge/gradle.properties
@@ -1,7 +1,7 @@
 org.gradle.jvmargs=-Xmx4G
 org.gradle.daemon=false
 
-mod_version=0.2.4
+mod_version=0.2.5
 mod_id=vanillaexperience
 mc_version=1.16.3
 forge_version=34.1.0

diff --git a/...n/java/com/vanilla/experience/forge/zerotickunpatch/mixin/ZeroTickAbstractPlantBlock.java b/...n/java/com/vanilla/experience/forge/zerotickunpatch/mixin/ZeroTickAbstractPlantBlock.java
@@ -20,6 +20,11 @@ public ZeroTickAbstractPlantBlock(Properties propertiesIn) {
 
     @Inject(at = @At("TAIL"), method = "tick(Lnet/minecraft/block/BlockState;Lnet/minecraft/world/server/ServerWorld;Lnet/minecraft/util/math/BlockPos;Ljava/util/Random;)V")
     public void tick(final BlockState state, final ServerWorld world, final BlockPos pos, final Random random, CallbackInfo info) {
+        if (!state.isValidPosition(world, pos)) {
+            world.destroyBlock(pos, true);
+            return;
+        }
+
         if(!world.isAirBlock(pos.down())) {
             this.randomTick(state, world, pos, random);
         }

diff --git a/gradle.properties b/gradle.properties
@@ -2,7 +2,7 @@
 # This is required to provide enough memory for the Minecraft decompilation process.
 org.gradle.jvmargs=-Xmx4G
 org.gradle.daemon=false
-mod_version=0.2.4
+mod_version=0.2.5
 mod_id=vanillaexperience
 mc_version=1.16.3
 forge_version=34.1.0