Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-20 18:07:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove ridable minecart block speeds debug output on server boot

Browse Source
This commit is contained in:
William Blake Galbreath
2019-07-10 23:08:07 -05:00
parent 62aabe5c51
commit 8fec9216db
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
patches/server/0036-Controllable-Minecarts.patch
View File

@@ -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 <blake.galbreath@gmail.com> From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sat, 29 Jun 2019 02:32:40 -0500 Date: Sat, 29 Jun 2019 02:32:40 -0500
Subject: [PATCH] Controllable Minecarts Subject: [PATCH] Controllable Minecarts
@@ -7,11 +7,11 @@ Subject: [PATCH] Controllable Minecarts
.../java/net/minecraft/server/Entity.java | 1 + .../java/net/minecraft/server/Entity.java | 1 +
.../server/EntityMinecartAbstract.java | 39 +++++++++++++++++++ .../server/EntityMinecartAbstract.java | 39 +++++++++++++++++++
.../net/minecraft/server/ItemMinecart.java | 8 ++-- .../net/minecraft/server/ItemMinecart.java | 8 ++--
.../java/net/pl3x/purpur/PurpurConfig.java | 31 +++++++++++++++ .../java/net/pl3x/purpur/PurpurConfig.java | 30 ++++++++++++++
4 files changed, 76 insertions(+), 3 deletions(-) 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 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 --- a/src/main/java/net/minecraft/server/Entity.java
+++ b/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 @@ -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 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 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -1,9 +1,13 @@ @@ -1,9 +1,13 @@
@@ -128,7 +128,7 @@ index 448d21d9e..0d378830e 100644
import org.bukkit.configuration.InvalidConfigurationException; import org.bukkit.configuration.InvalidConfigurationException;
import org.bukkit.configuration.file.YamlConfiguration; 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); ridableZombiePigman = getBoolean("settings.ridable.zombie_pigman", ridableZombiePigman);
ridableZombieVillager = getBoolean("settings.ridable.zombie_villager", ridableZombieVillager); ridableZombieVillager = getBoolean("settings.ridable.zombie_villager", ridableZombieVillager);
} }
@@ -154,7 +154,6 @@ index 448d21d9e..0d378830e 100644
+ Block block = IRegistry.BLOCK.get(new MinecraftKey(key)); + Block block = IRegistry.BLOCK.get(new MinecraftKey(key));
+ if (block != null) { + if (block != null) {
+ controllableMinecartsBlockSpeeds.put(block, section.getDouble(key, controllableMinecartsBaseSpeed)); + controllableMinecartsBlockSpeeds.put(block, section.getDouble(key, controllableMinecartsBaseSpeed));
+ System.out.println(block + " === " +controllableMinecartsBlockSpeeds.get(block));
+ } + }
+ } + }
+ } + }