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

Fix up some configuration shit

Browse Source
This commit is contained in:
William Blake Galbreath
2020-02-20 20:23:57 -06:00
parent 002002a1c7
commit 9a9766e917
66 changed files with 265 additions and 254 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
patches/server/0030-Controllable-Minecarts.patch
View File

@@ -1,4 +1,4 @@
From 30ad015f93cd66d81bcb5bfce4c05851a0db3fb1 Mon Sep 17 00:00:00 2001
From 4f7e9fe896649cbd6b8825bbf68e03e692a347f6 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sat, 29 Jun 2019 02:32:40 -0500
Subject: [PATCH] Controllable Minecarts
@@ -7,8 +7,8 @@ Subject: [PATCH] Controllable Minecarts
.../java/net/minecraft/server/Entity.java | 1 +
.../server/EntityMinecartAbstract.java | 38 +++++++++++++++++++
.../net/minecraft/server/ItemMinecart.java | 8 ++--
.../net/pl3x/purpur/PurpurWorldConfig.java | 38 +++++++++++++++++++
4 files changed, 82 insertions(+), 3 deletions(-)
.../net/pl3x/purpur/PurpurWorldConfig.java | 32 ++++++++++++++++
4 files changed, 76 insertions(+), 3 deletions(-)
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 1d967ad6a1..2bbdb994a5 100644
@@ -103,10 +103,10 @@ index b73e317fbb..e1337a9c04 100644
}
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 07c3952df1..7add972253 100644
index 346ab82e62..63afc5d98e 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1,9 +1,16 @@
@@ -1,10 +1,16 @@
package net.pl3x.purpur;
import com.destroystokyo.paper.PaperWorldConfig;
@@ -114,7 +114,7 @@ index 07c3952df1..7add972253 100644
+import net.minecraft.server.Blocks;
+import net.minecraft.server.IRegistry;
+import net.minecraft.server.MinecraftKey;
+import org.bukkit.configuration.ConfigurationSection;
import org.bukkit.configuration.ConfigurationSection;
import org.spigotmc.SpigotWorldConfig;
+import java.util.HashMap;
@@ -123,19 +123,7 @@ index 07c3952df1..7add972253 100644
import static net.pl3x.purpur.PurpurConfig.log;
@@ -33,6 +40,11 @@ public class PurpurWorldConfig {
}
}
+ private ConfigurationSection getConfigurationSection(String path) {
+ ConfigurationSection section = PurpurConfig.config.getConfigurationSection("world-settings." + worldName + "." + path);
+ return section != null ? section : PurpurConfig.config.getConfigurationSection("world-settings.default." + path);
+ }
+
private boolean getBoolean(String path, boolean def) {
PurpurConfig.config.addDefault("world-settings.default." + path, def);
return PurpurConfig.config.getBoolean("world-settings." + worldName + "." + path, PurpurConfig.config.getBoolean("world-settings.default." + path));
@@ -77,6 +89,32 @@ public class PurpurWorldConfig {
@@ -84,6 +90,32 @@ public class PurpurWorldConfig {
turtleEggsBreakFromMinecarts = getBoolean("blocks.turtle_egg.break-from-minecarts", turtleEggsBreakFromMinecarts);
}