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

Fix some options showing multiple times

Browse Source
This commit is contained in:
William Blake Galbreath
2019-08-31 17:18:41 -05:00
parent 3e985ba1d5
commit a14d121ee5
12 changed files with 66 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
patches/server/0058-Option-for-slimes-not-pushable.patch
View File

@@ -1,12 +1,12 @@
From 95a99311f4b9e531e4308604b51b1a7c0e47578f Mon Sep 17 00:00:00 2001
From 51c6e0b1fa1ac7f9eac376a30d2ad37f88e45569 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Fri, 23 Aug 2019 21:56:31 -0500
Subject: [PATCH] Option for slimes not pushable
---
src/main/java/net/minecraft/server/BlockSlime.java | 5 +++++
src/main/java/net/pl3x/purpur/PurpurConfig.java | 14 ++++++++++++++
2 files changed, 19 insertions(+)
src/main/java/net/pl3x/purpur/PurpurConfig.java | 11 +++++++++++
2 files changed, 16 insertions(+)
diff --git a/src/main/java/net/minecraft/server/BlockSlime.java b/src/main/java/net/minecraft/server/BlockSlime.java
index fd54958f6..0f4cdd5ed 100644
@@ -23,21 +23,18 @@ index fd54958f6..0f4cdd5ed 100644
+ }
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index 9532bf349..808a5bb8a 100644
index 4f6df3ba6..14930aea7 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -284,6 +284,20 @@ public class PurpurConfig {
@@ -281,6 +281,17 @@ public class PurpurConfig {
InventoryType.BARREL.setDefaultSize(packedBarrels ? 54 : 27);
}
+ public static boolean slimeBlocksNotPushable = false;
+ private static void slimeBlocksNotPushable() {
+ if (version < 2) {
+ boolean oldValue = getBoolean("slimes-not-pushable", slimeBlocksNotPushable);
+ oldValue = getBoolean("settings.slimes-not-pushable", oldValue);
+
+ set("slimes-not-pushable", null);
+ set("settings.slimes-not-pushable", null);
+ boolean oldValue = config.getBoolean("slimes-not-pushable", slimeBlocksNotPushable);
+ oldValue = config.getBoolean("settings.slimes-not-pushable", oldValue);
+
+ set("settings.slime-blocks-not-pushable", oldValue);
+ }