Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-21 18:37: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

8
patches/server/0069-Barrels-have-6-rows.patch
View File

@@ -1,4 +1,4 @@
From bbee5192bcc8ff81430f9ec8c9b24d4933b60a1b Mon Sep 17 00:00:00 2001
From bc374fae9fa70efd6fe9d18e8b5cc9474b13656d Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Thu, 23 May 2019 21:50:37 -0500
Subject: [PATCH] Barrels have 6 rows
@@ -53,7 +53,7 @@ index 1e27abbea0..d1a3aae91f 100644
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index 03185a7480..a8aede672f 100644
index 3cd53cc3aa..f9e989d7c6 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -6,6 +6,7 @@ import org.bukkit.Bukkit;
@@ -64,14 +64,14 @@ index 03185a7480..a8aede672f 100644
import java.io.File;
import java.io.IOException;
@@ -169,8 +170,16 @@ public class PurpurConfig {
@@ -171,8 +172,16 @@ public class PurpurConfig {
fixItemPositionDesync = getBoolean("settings.fix-item-position-desync", fixItemPositionDesync);
}
+ public static boolean barrelSixRows = false;
public static boolean slimeBlocksNotPushable = false;
private static void blockSettings() {
+ if (CONFIG_VERSION < 3) {
+ if (version < 3) {
+ boolean oldValue = getBoolean("settings.barrel.packed-barrels", true);
+ set("settings.blocks.barrel.six-rows", oldValue);
+ set("settings.packed-barrels", null);