Fix crashing when trying to replace snow. (Pulled from 1.12), and upd…

…ate mappings to fix the damn build -_-
progwml6 · Aug 12, 2017 · 4ca3e1c · 4ca3e1c
1 parent 2ea1a1b
commit 4ca3e1c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -3,7 +3,7 @@ mod_version=4.1.0
 minecraft_version=1.10.2
 
 forge_version=12.18.3.2316
-mappings_version=snapshot_20161115
+mappings_version=snapshot_20161116
 
 mantle_version=1.1.5.+
 tconstruct_version=2.6.3.+

diff --git a/src/main/java/com/progwml6/natura/world/worldgen/trees/overworld/OverworldTreeGenerator.java b/src/main/java/com/progwml6/natura/world/worldgen/trees/overworld/OverworldTreeGenerator.java
@@ -229,7 +229,7 @@ protected void placeTrunk(World world, BlockPos pos, int height)
             IBlockState state = world.getBlockState(blockpos);
             Block block = state.getBlock();
 
-            if (block == null || block.isAir(state, world, pos) || block.isLeaves(state, world, pos) || block.isReplaceable(world, pos))
+            if (block == null || block.isAir(state, world, blockpos) || block.isLeaves(state, world, blockpos) || block.isReplaceable(world, blockpos))
             {
                 world.setBlockState(blockpos, this.log, 2);
             }