diff --git a/patches/server/0036-Controllable-Minecarts.patch b/patches/server/0036-Controllable-Minecarts.patch index a12165e36..9344fd2ca 100644 --- a/patches/server/0036-Controllable-Minecarts.patch +++ b/patches/server/0036-Controllable-Minecarts.patch @@ -1,4 +1,4 @@ -From 41c5e35813ee98cc04ca1a8287ce5db312c37895 Mon Sep 17 00:00:00 2001 +From de829105f192e14335e96997d068ec083916f599 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 29 Jun 2019 02:32:40 -0500 Subject: [PATCH] Controllable Minecarts @@ -7,11 +7,11 @@ Subject: [PATCH] Controllable Minecarts .../java/net/minecraft/server/Entity.java | 1 + .../server/EntityMinecartAbstract.java | 39 +++++++++++++++++++ .../net/minecraft/server/ItemMinecart.java | 8 ++-- - .../java/net/pl3x/purpur/PurpurConfig.java | 31 +++++++++++++++ - 4 files changed, 76 insertions(+), 3 deletions(-) + .../java/net/pl3x/purpur/PurpurConfig.java | 30 ++++++++++++++ + 4 files changed, 75 insertions(+), 3 deletions(-) diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index e8b5729ef..553975c46 100644 +index cf5d829f6..66824d1a7 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -1294,6 +1294,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -111,7 +111,7 @@ index 764427456..456eced16 100644 } } diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index 448d21d9e..0d378830e 100644 +index 448d21d9e..8f5316941 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -1,9 +1,13 @@ @@ -128,7 +128,7 @@ index 448d21d9e..0d378830e 100644 import org.bukkit.configuration.InvalidConfigurationException; import org.bukkit.configuration.file.YamlConfiguration; -@@ -293,4 +297,31 @@ public class PurpurConfig { +@@ -293,4 +297,30 @@ public class PurpurConfig { ridableZombiePigman = getBoolean("settings.ridable.zombie_pigman", ridableZombiePigman); ridableZombieVillager = getBoolean("settings.ridable.zombie_villager", ridableZombieVillager); } @@ -154,7 +154,6 @@ index 448d21d9e..0d378830e 100644 + Block block = IRegistry.BLOCK.get(new MinecraftKey(key)); + if (block != null) { + controllableMinecartsBlockSpeeds.put(block, section.getDouble(key, controllableMinecartsBaseSpeed)); -+ System.out.println(block + " === " +controllableMinecartsBlockSpeeds.get(block)); + } + } + }