Fix a few global configuration options being unavailable

6 files changed, 20 insertions, 20 deletions

diff --git a/Spigot-API-Patches/0032-Reduce-thread-synchronization-in-MetadataStoreBase.patch b/Spigot-API-Patches/0032-Reduce-thread-synchronization-in-MetadataStoreBase.patch
index c30f4d4b5c..fcf5dd87c7 100644
--- a/Spigot-API-Patches/0032-Reduce-thread-synchronization-in-MetadataStoreBase.patch
+++ b/Spigot-API-Patches/0032-Reduce-thread-synchronization-in-MetadataStoreBase.patch
@@ -1,4 +1,4 @@
-From dd1173b521819609b5a9625b4da4a464ef403db7 Mon Sep 17 00:00:00 2001
+From 04d794e4aeb4d0b185ed67c14a188f269fb7802b Mon Sep 17 00:00:00 2001
 From: crast <[email protected]>
 Date: Sat, 1 Jun 2013 13:52:30 -0600
 Subject: [PATCH] Reduce thread synchronization in MetadataStoreBase
@@ -101,5 +101,5 @@ index 093c144..64c0f0a 100644
          for (Map<Plugin, MetadataValue> values : metadataMap.values()) {
              if (values.containsKey(owningPlugin)) {
 -- 
-2.8.0
+2.8.3.windows.1
 
diff --git a/Spigot-API-Patches/0033-Add-MetadataStoreBase.removeAll-Plugin.patch b/Spigot-API-Patches/0033-Add-MetadataStoreBase.removeAll-Plugin.patch
index 4d229d2ce5..c29bd3cc26 100644
--- a/Spigot-API-Patches/0033-Add-MetadataStoreBase.removeAll-Plugin.patch
+++ b/Spigot-API-Patches/0033-Add-MetadataStoreBase.removeAll-Plugin.patch
@@ -1,4 +1,4 @@
-From 61a2f66cc4b6f90f0488d5f4f7df76153ddbbaf9 Mon Sep 17 00:00:00 2001
+From 1e48496f8fce2c543a8bace6a565bce6ccbe1c97 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Tue, 16 Jul 2013 21:26:50 -0400
 Subject: [PATCH] Add MetadataStoreBase.removeAll(Plugin)
@@ -37,5 +37,5 @@ index 64c0f0a..6da6abd 100644
       * unique data from the subject with a metadataKey.
       * <p>
 -- 
-2.8.0
+2.8.3.windows.1
 
diff --git a/Spigot-Server-Patches/0051-Configurable-Chunk-IO-Thread-Base-Count.patch b/Spigot-Server-Patches/0051-Configurable-Chunk-IO-Thread-Base-Count.patch
index f49c070349..7b0b0deaa8 100644
--- a/Spigot-Server-Patches/0051-Configurable-Chunk-IO-Thread-Base-Count.patch
+++ b/Spigot-Server-Patches/0051-Configurable-Chunk-IO-Thread-Base-Count.patch
@@ -1,11 +1,11 @@
-From 2a6a8a92552ab6784e8995cfca8f38973f10064a Mon Sep 17 00:00:00 2001
+From 551087a24681a0f47c192a5a3c40355a4efbdfa1 Mon Sep 17 00:00:00 2001
 From: Zach Brown <[email protected]>
 Date: Wed, 2 Mar 2016 23:46:57 -0600
 Subject: [PATCH] Configurable Chunk IO Thread Base Count
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index f9a4bf4..1ea409d 100644
+index 87bae87..9ab6445 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -192,4 +192,9 @@ public class PaperConfig {
@@ -14,7 +14,7 @@ index f9a4bf4..1ea409d 100644
      }
 +
 +    public static int minChunkLoadThreads = 2;
-+    public static void chunkLoadThreads() {
++    private static void chunkLoadThreads() {
 +        minChunkLoadThreads = Math.min(6, getInt("settings.min-chunk-load-threads", 2)); // Keep people from doing stupid things with max of 6
 +    }
  }
@@ -39,5 +39,5 @@ index e4fd9bc..7b7a3d0 100644
  
      private static final AsynchronousExecutor<QueuedChunk, Chunk, Runnable, RuntimeException> instance = new AsynchronousExecutor<QueuedChunk, Chunk, Runnable, RuntimeException>(new ChunkIOProvider(), BASE_THREADS);
 -- 
-2.8.2
+2.8.3.windows.1
 
diff --git a/Spigot-Server-Patches/0077-Chunk-save-queue-improvements.patch b/Spigot-Server-Patches/0077-Chunk-save-queue-improvements.patch
index c2544b5cc5..50f056c604 100644
--- a/Spigot-Server-Patches/0077-Chunk-save-queue-improvements.patch
+++ b/Spigot-Server-Patches/0077-Chunk-save-queue-improvements.patch
@@ -1,4 +1,4 @@
-From eb5a4b0fec91f8e10fa250db93b854bc758e781e Mon Sep 17 00:00:00 2001
+From eb751a1284762ac0d294c8609b57edc8fbaa85e9 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Fri, 4 Mar 2016 18:18:37 -0600
 Subject: [PATCH] Chunk save queue improvements
@@ -26,11 +26,11 @@ Then finally, Sleeping will by default be removed, but due to known issues with
 But if sleeps are to remain enabled, we at least lower the sleep interval so it doesn't have as much negative impact.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 1ea409d..34e0426 100644
+index 9ab6445..d01bca1 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -197,4 +197,10 @@ public class PaperConfig {
-     public static void chunkLoadThreads() {
+     private static void chunkLoadThreads() {
          minChunkLoadThreads = Math.min(6, getInt("settings.min-chunk-load-threads", 2)); // Keep people from doing stupid things with max of 6
      }
 +
@@ -170,5 +170,5 @@ index 4733f94..113aea2 100644
  
          if (this.b.isEmpty()) {
 -- 
-2.8.2
+2.8.3.windows.1
 
diff --git a/Spigot-Server-Patches/0090-Set-health-before-death-event.patch b/Spigot-Server-Patches/0090-Set-health-before-death-event.patch
index 185dd0180f..f773b046a6 100644
--- a/Spigot-Server-Patches/0090-Set-health-before-death-event.patch
+++ b/Spigot-Server-Patches/0090-Set-health-before-death-event.patch
@@ -1,11 +1,11 @@
-From 89b9ff23e310a5075ffd1bd9d7b3d9ac4a1ad396 Mon Sep 17 00:00:00 2001
+From b5f5309151ea82ece4f4131a649364e0b1cab626 Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <[email protected]>
 Date: Sun, 19 Jul 2015 16:51:38 -0400
 Subject: [PATCH] Set health before death event
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 770866f..de1717a 100644
+index 2e17397..f0f8cb2 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -208,4 +208,9 @@ public class PaperConfig {
@@ -14,7 +14,7 @@ index 770866f..de1717a 100644
      }
 +
 +    public static boolean setHealthBeforeDeathEvent = false;
-+    public static void healthDeath() {
++    private static void healthDeath() {
 +        setHealthBeforeDeathEvent = getBoolean("settings.set-health-before-death-event", false);
 +    }
  }
@@ -46,5 +46,5 @@ index 16da1c9..b1e63f0 100644
  
      public double getMaxHealth() {
 -- 
-2.8.2
+2.8.3.windows.1
 
diff --git a/Spigot-Server-Patches/0113-Sanitise-RegionFileCache-and-make-configurable.patch b/Spigot-Server-Patches/0113-Sanitise-RegionFileCache-and-make-configurable.patch
index 2d7b01720b..cbd94f271a 100644
--- a/Spigot-Server-Patches/0113-Sanitise-RegionFileCache-and-make-configurable.patch
+++ b/Spigot-Server-Patches/0113-Sanitise-RegionFileCache-and-make-configurable.patch
@@ -1,4 +1,4 @@
-From c271a5abbff60db08b940d4ab12dc410edcb3722 Mon Sep 17 00:00:00 2001
+From aa85d772459274d8867fd6caa47149e63ff3725b Mon Sep 17 00:00:00 2001
 From: Antony Riley <[email protected]>
 Date: Tue, 29 Mar 2016 08:22:55 +0300
 Subject: [PATCH] Sanitise RegionFileCache and make configurable.
@@ -11,11 +11,11 @@ The implementation uses a LinkedHashMap as an LRU cache (modified from HashMap).
 The maximum size of the RegionFileCache is also made configurable.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index de1717a..3c52736 100644
+index f0f8cb2..22c7dea 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -213,4 +213,9 @@ public class PaperConfig {
-     public static void healthDeath() {
+     private static void healthDeath() {
          setHealthBeforeDeathEvent = getBoolean("settings.set-health-before-death-event", false);
      }
 +
@@ -77,5 +77,5 @@ index 5eb01c3..9744e72 100644
          Iterator iterator = RegionFileCache.a.values().iterator();
  
 -- 
-2.8.2
+2.8.3.windows.1