Fix up some configuration shit

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

View File

@@ -1,4 +1,4 @@
From 00b5b4af23c3e426c6046d44c44d83dea156b0c8 Mon Sep 17 00:00:00 2001
From e4f019f1388c8fc8f08044fc99a3d6dd7306507f Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sun, 14 Jul 2019 19:52:47 -0500
Subject: [PATCH] Mending mends most damages equipment first
@@ -86,10 +86,10 @@ index 4730c2beb7..4fe5038083 100644
return this.tag == null ? 0 : this.tag.getInt("Damage");
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index fabe7d8e00..61a04c4f86 100644
index a723f12a5e..128eaa4acf 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -126,6 +126,7 @@ public class PurpurWorldConfig {
@@ -127,6 +127,7 @@ public class PurpurWorldConfig {
public Map<Block, Double> controllableMinecartsBlockSpeeds = new HashMap<>();
public boolean disableDropsOnCrammingDeath = false;
public boolean milkCuresBadOmen = true;
@@ -97,7 +97,7 @@ index fabe7d8e00..61a04c4f86 100644
private void gameplayMechanicsSettings() {
controllableMinecarts = getBoolean("gameplay-mechanics.controllable-minecarts.enabled", controllableMinecarts);
controllableMinecartsPlaceAnywhere = getBoolean("gameplay-mechanics.controllable-minecarts.place-anywhere", controllableMinecartsPlaceAnywhere);
@@ -146,6 +147,7 @@ public class PurpurWorldConfig {
@@ -147,6 +148,7 @@ public class PurpurWorldConfig {
}
disableDropsOnCrammingDeath = getBoolean("gameplay-mechanics.disable-drops-on-cramming-death", disableDropsOnCrammingDeath);
milkCuresBadOmen = getBoolean("gameplay-mechanics.milk-cures-bad-omen", milkCuresBadOmen);