Update the "changing the blocks that turn into paths" defaults to reflect the vanilla defaults. (#322)

* Update the "changing the blocks that turn into paths" defaults to reflect the vanilla defaults

* Apparently grass is the only one that can change to paths in 1.16

* Rebuild patches

Co-authored-by: Encode42 <me@encode42.dev>
This commit is contained in:
Roan-V
2021-05-07 19:47:50 +02:00
committed by GitHub
parent a24b31b74c
commit 73ab4e64ff
2 changed files with 4 additions and 6 deletions

View File

@@ -18,10 +18,10 @@ index 9ba8ae49e18fb8714b434715bd669b8e22004cd7..c0c87d0dc8d6f02597219cd6a74e6ed7
if (iblockdata1 != null && world.getType(blockposition.up()).isAir()) {
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 3d3e4e686cd74145b002b2df276e61762697918b..63a1b0f569c8f034e7577c304ec23a7a96c666f7 100644
index 3d3e4e686cd74145b002b2df276e61762697918b..e082de2fdbd4803f5c79699b813062291f8e2bb7 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -469,6 +469,18 @@ public class PurpurWorldConfig {
@@ -469,6 +469,16 @@ public class PurpurWorldConfig {
totemOfUndyingWorksInInventory = getBoolean("gameplay-mechanics.player.totem-of-undying-works-in-inventory", totemOfUndyingWorksInInventory);
}
@@ -29,8 +29,6 @@ index 3d3e4e686cd74145b002b2df276e61762697918b..63a1b0f569c8f034e7577c304ec23a7a
+ private void shovelSettings() {
+ getList("gameplay-mechanics.shovel-turns-block-to-grass-path", new ArrayList<String>(){{
+ add("minecraft:grass_block");
+ add("minecraft:dirt");
+ add("minecraft:coarse_dirt");
+ }}).forEach(key -> {
+ Block block = IRegistry.BLOCK.get(new MinecraftKey(key.toString()));
+ if (block != Blocks.AIR) shovelTurnsBlockToGrassPath.add(block);

View File

@@ -45,10 +45,10 @@ index 6c9c4ab65b7e42efa68027057242e25b70313081..cbe34059659e0f80ff384508b01e516c
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 63a1b0f569c8f034e7577c304ec23a7a96c666f7..a08bf2a374a486cf44128a87667567df65329e0c 100644
index e082de2fdbd4803f5c79699b813062291f8e2bb7..07c66f9d41e7a74021dde6702d654710e400e93b 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -2157,4 +2157,9 @@ public class PurpurWorldConfig {
@@ -2155,4 +2155,9 @@ public class PurpurWorldConfig {
magmaBlockDamageWhenSneaking = getBoolean("blocks.magma-block.damage-when-sneaking", magmaBlockDamageWhenSneaking);
magmaBlockDamageWithFrostWalker = getBoolean("blocks.magma-block.damage-with-frost-walker", magmaBlockDamageWithFrostWalker);
}