Missed diff, unused config entry, general cleanup

cc GH-170

Spigot-Server-Patches/0022-Optimize-TileEntity-Ticking.patch

@@ -1,11 +1,11 @@
-From 97671c73d297bf6f9938d518d162b9323c1482ae Mon Sep 17 00:00:00 2001
+From 8ea5671563d902a6a971506d8ea12f01bd943b4c Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Tue, 1 Mar 2016 22:01:19 -0600
 Subject: [PATCH] Optimize TileEntity Ticking
 
 
 diff --git a/src/main/java/net/minecraft/server/TileEntityChest.java b/src/main/java/net/minecraft/server/TileEntityChest.java
-index 8f988c3..4b510b9 100644
+index e82c8e3..722dfac 100644
 --- a/src/main/java/net/minecraft/server/TileEntityChest.java
 +++ b/src/main/java/net/minecraft/server/TileEntityChest.java
 @@ -8,17 +8,17 @@ import org.bukkit.craftbukkit.entity.CraftHumanEntity;
@@ -52,7 +52,7 @@ index 8f988c3..4b510b9 100644
      }
  
      public boolean c(int i, int j) {
-@@ -331,6 +334,29 @@ public class TileEntityChest extends TileEntityLootable implements ITickable, II
+@@ -331,6 +334,28 @@ public class TileEntityChest extends TileEntityLootable implements ITickable, II
              int oldPower = Math.max(0, Math.min(15, this.l)); // CraftBukkit - Get power before new viewer is added
  
              ++this.l;
@@ -65,7 +65,6 @@ index 8f988c3..4b510b9 100644
 +
 +                double d0 = (double) this.position.getZ() + 0.5D;
 +                double d1 = (double) this.position.getX() + 0.5D;
-+                int yLoc = this.position.getY();
 +
 +                if (this.i != null) {
 +                    d0 += 0.5D;
@@ -75,14 +74,14 @@ index 8f988c3..4b510b9 100644
 +                    d1 += 0.5D;
 +                }
 +
-+                this.world.a((EntityHuman) null, d1, (double) yLoc + 0.5D, d0, SoundEffects.X, SoundCategory.BLOCKS, 0.5F, this.world.random.nextFloat() * 0.1F + 0.9F);
++                this.world.a((EntityHuman) null, d1, (double) this.position.getY() + 0.5D, d0, SoundEffects.X, SoundCategory.BLOCKS, 0.5F, this.world.random.nextFloat() * 0.1F + 0.9F);
 +            }
 +            // Paper end
 +
              if (this.world == null) return; // CraftBukkit
              this.world.playBlockAction(this.position, this.getBlock(), 1, this.l);
  
-@@ -354,6 +380,34 @@ public class TileEntityChest extends TileEntityLootable implements ITickable, II
+@@ -354,6 +379,34 @@ public class TileEntityChest extends TileEntityLootable implements ITickable, II
              int oldPower = Math.max(0, Math.min(15, this.l)); // CraftBukkit - Get power before new viewer is added
              --this.l;
              if (this.world == null) return; // CraftBukkit
@@ -118,7 +117,7 @@ index 8f988c3..4b510b9 100644
  
              // CraftBukkit start - Call redstone event
 diff --git a/src/main/java/net/minecraft/server/TileEntityEnderChest.java b/src/main/java/net/minecraft/server/TileEntityEnderChest.java
-index e454622..d01b65a 100644
+index d9a0346..9276a46 100644
 --- a/src/main/java/net/minecraft/server/TileEntityEnderChest.java
 +++ b/src/main/java/net/minecraft/server/TileEntityEnderChest.java
 @@ -1,15 +1,17 @@
@@ -163,7 +162,7 @@ index e454622..d01b65a 100644
 +            double d1 = (double) this.getPosition().getX() + 0.5D;
 +            double d0 = (double) this.getPosition().getZ() + 0.5D;
 +
-+            this.world.a((EntityHuman) null, d1, (double) this.getPosition().getY() + 0.5D, d0, SoundEffects.aL, SoundCategory.BLOCKS, 0.5F, this.world.random.nextFloat() * 0.1F + 0.9F);
++            this.world.a((EntityHuman) null, d1, (double) this.getPosition().getY() + 0.5D, d0, SoundEffects.aM, SoundCategory.BLOCKS, 0.5F, this.world.random.nextFloat() * 0.1F + 0.9F);
 +        }
 +        // Paper end
 +
@@ -178,7 +177,7 @@ index e454622..d01b65a 100644
 +            double d0 = (double) this.getPosition().getX() + 0.5D;
 +            double d2 = (double) this.getPosition().getZ() + 0.5D;
 +
-+            this.world.a((EntityHuman) null, d0, (double) this.getPosition().getY() + 0.5D, d2, SoundEffects.aK, SoundCategory.BLOCKS, 0.5F, this.world.random.nextFloat() * 0.1F + 0.9F);
++            this.world.a((EntityHuman) null, d0, (double) this.getPosition().getY() + 0.5D, d2, SoundEffects.aL, SoundCategory.BLOCKS, 0.5F, this.world.random.nextFloat() * 0.1F + 0.9F);
 +            this.a = 0.0F;
 +        }
 +        // Paper end

Spigot-Server-Patches/0031-Lighting-Queue.patch

@@ -1,4 +1,4 @@
-From 0c7102107d53530cbc3158beae7f75f00b4daca3 Mon Sep 17 00:00:00 2001
+From 1058af235335e48fa69b95461b0127b3a57148bb Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Wed, 2 Mar 2016 00:52:31 -0600
 Subject: [PATCH] Lighting Queue
@@ -17,24 +17,14 @@ index 3f4271c..5fdf051 100644
      public static final Timing tickEntityTimer = Timings.ofSafe("## tickEntity");
      public static final Timing tickTileEntityTimer = Timings.ofSafe("## tickTileEntity");
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 7c0e61f..e0e9a65 100644
+index 7c0e61f..8e3a0f3 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -155,4 +155,20 @@ public class PaperWorldConfig {
+@@ -155,4 +155,10 @@ public class PaperWorldConfig {
          netherVoidTopDamage = getBoolean( "nether-ceiling-void-damage", false );
          log("Top of the nether void damage: " + netherVoidTopDamage);
      }
 +
-+    public int tickNextTickCap;
-+    public boolean tickNextTickListCapIgnoresRedstone;
-+    private void tickNextTickCap() {
-+        tickNextTickCap = getInt("tick-next-tick-list-cap", 1000); // Higher values will be friendlier to vanilla style mechanics (to a point) but may hurt performance
-+        tickNextTickListCapIgnoresRedstone = getBoolean("tick-next-tick-list-cap-ignores-redstone", false); // Redstone TickNextTicks will always bypass the preceding cap
-+        log("WorldServer TickNextTick cap set at " + tickNextTickCap);
-+        log("WorldServer TickNextTickList cap always processes redstone: " + tickNextTickListCapIgnoresRedstone);
-+
-+    }
-+
 +    public boolean queueLightUpdates;
 +    private void queueLightUpdates() {
 +        queueLightUpdates = getBoolean("queue-light-updates", false);
@@ -240,5 +230,5 @@ index f8746b3..a6d4097 100644
                  }
  
 -- 
-2.8.0
+2.7.4
 

Spigot-Server-Patches/0033-Configurable-end-credits.patch

@@ -1,14 +1,14 @@
-From d34f8c81adc1f3e993c07929e82eda897197eca4 Mon Sep 17 00:00:00 2001
+From 172822275bb7cf1ea56a306a5d08b4daa652e8bb Mon Sep 17 00:00:00 2001
 From: DoctorDark <doctordark11@gmail.com>
 Date: Wed, 16 Mar 2016 02:21:39 -0500
 Subject: [PATCH] Configurable end credits
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index e0e9a65..3a57c8e 100644
+index 8e3a0f3..2e88385 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -171,4 +171,10 @@ public class PaperWorldConfig {
+@@ -161,4 +161,10 @@ public class PaperWorldConfig {
          queueLightUpdates = getBoolean("queue-light-updates", false);
          log("Lighting Queue enabled: " + queueLightUpdates);
      }
@@ -52,5 +52,5 @@ index 3e33f49..8d04c82 100644
                  } else {
                      this.b((Statistic) AchievementList.D);
 -- 
-2.8.0
+2.7.4
 

Spigot-Server-Patches/0035-Generator-Settings.patch

@@ -1,14 +1,14 @@
-From a96d56be4ce9239126a7d0677042ca9a9c429e58 Mon Sep 17 00:00:00 2001
+From b3cf4f737279693fbcdbd2dd992cdcbc7389adea Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Wed, 2 Mar 2016 02:17:54 -0600
 Subject: [PATCH] Generator Settings
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 3a57c8e..66deccb 100644
+index 2e88385..af2491e 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -177,4 +177,28 @@ public class PaperWorldConfig {
+@@ -167,4 +167,28 @@ public class PaperWorldConfig {
          disableEndCredits = getBoolean("game-mechanics.disable-end-credits", false);
          log("End credits disabled: " + disableEndCredits);
      }
@@ -265,5 +265,5 @@ index 22d96e9..83d9509 100644
          Iterator iterator = this.c.values().iterator();
  
 -- 
-2.8.0
+2.7.4
 

Spigot-Server-Patches/0036-Optimize-explosions.patch

@@ -1,4 +1,4 @@
-From 433cc3bbabdc8eada43006b218bfaf6064bb7c71 Mon Sep 17 00:00:00 2001
+From b389a0730f5ef11a6069b5b4e559353eb224f82b Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Wed, 2 Mar 2016 11:59:48 -0600
 Subject: [PATCH] Optimize explosions
@@ -10,10 +10,10 @@ This patch adds a per-tick cache that is used for storing and retrieving
 an entity's exposure during an explosion.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 66deccb..09b9867 100644
+index af2491e..54e31ca 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -201,4 +201,10 @@ public class PaperWorldConfig {
+@@ -191,4 +191,10 @@ public class PaperWorldConfig {
          generateVillage = getBoolean("generator-settings.village", true);
          generateFlatBedrock = getBoolean("generator-settings.flat-bedrock", false);
      }
@@ -156,5 +156,5 @@ index a6d4097..c0f0b83 100644
      public CraftWorld getWorld() {
          return this.world;
 -- 
-2.8.0
+2.7.4
 

Spigot-Server-Patches/0038-Fast-draining.patch

@@ -1,14 +1,14 @@
-From 123f7daf33fadf6f80077c2be0974454fde2f7b1 Mon Sep 17 00:00:00 2001
+From 83f33bd21ad4907eed1e0903875bdb7e2b3b0a2a Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Wed, 2 Mar 2016 12:20:52 -0600
 Subject: [PATCH] Fast draining
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 09b9867..658e430 100644
+index 54e31ca..f2babb1 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -207,4 +207,11 @@ public class PaperWorldConfig {
+@@ -197,4 +197,11 @@ public class PaperWorldConfig {
          optimizeExplosions = getBoolean("optimize-explosions", false);
          log("Optimize explosions: " + optimizeExplosions);
      }
@@ -96,5 +96,5 @@ index 1f07f82..517c1e8 100644
 +    }
  }
 -- 
-2.8.0
+2.7.4
 

Spigot-Server-Patches/0039-Configurable-lava-flow-speed.patch

@@ -1,14 +1,14 @@
-From a4b691d0c39da80e14863ca658c80f9afb6506de Mon Sep 17 00:00:00 2001
+From 29936727db751db597a05c48da18d19e272bad05 Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Wed, 2 Mar 2016 12:27:07 -0600
 Subject: [PATCH] Configurable lava flow speed
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 658e430..095f3b6 100644
+index f2babb1..ba7184f 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -214,4 +214,11 @@ public class PaperWorldConfig {
+@@ -204,4 +204,11 @@ public class PaperWorldConfig {
          fastDrainLava = getBoolean("fast-drain.lava", false);
          fastDrainWater = getBoolean("fast-drain.water", false);
      }
@@ -35,5 +35,5 @@ index 517c1e8..51b80cb 100644
                  world.getType(blockposition.north(1)).getBlock().material == Material.LAVA ||
                          world.getType(blockposition.south(1)).getBlock().material == Material.LAVA ||
 -- 
-2.8.0
+2.7.4
 

Spigot-Server-Patches/0041-Disable-explosion-knockback.patch

@@ -1,14 +1,14 @@
-From 3b7cd69c0a28f2310feb483fe385636155aa1eb3 Mon Sep 17 00:00:00 2001
+From 8027ea5b51f888ad7ae33e72e87c47f2cc1ffde4 Mon Sep 17 00:00:00 2001
 From: Sudzzy <originmc@outlook.com>
 Date: Wed, 2 Mar 2016 14:48:03 -0600
 Subject: [PATCH] Disable explosion knockback
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 095f3b6..491a8a7 100644
+index ba7184f..2626f81 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -221,4 +221,9 @@ public class PaperWorldConfig {
+@@ -211,4 +211,9 @@ public class PaperWorldConfig {
          lavaFlowSpeedNormal = getInt("lava-flow-speed.normal", 30);
          lavaFlowSpeedNether = getInt("lava-flow-speed.nether", 10);
      }
@@ -69,5 +69,5 @@ index 7e99b7d..91540c7 100644
                              }
                          }
 -- 
-2.8.0
+2.7.4
 

Spigot-Server-Patches/0042-Disable-thunder.patch

@@ -1,14 +1,14 @@
-From 16e99fad4aaad1c8e519e9f77ef13c47e6f9191d Mon Sep 17 00:00:00 2001
+From 923f3d8ea4be870cbea8dbc9f3d868b766969bdf Mon Sep 17 00:00:00 2001
 From: Sudzzy <originmc@outlook.com>
 Date: Wed, 2 Mar 2016 14:52:43 -0600
 Subject: [PATCH] Disable thunder
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 491a8a7..a665e3a 100644
+index 2626f81..1a341d8 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -226,4 +226,9 @@ public class PaperWorldConfig {
+@@ -216,4 +216,9 @@ public class PaperWorldConfig {
      private void disableExplosionKnockback(){
          disableExplosionKnockback = getBoolean("disable-explosion-knockback", false);
      }
@@ -33,5 +33,5 @@ index 8b90615..94b5c37 100644
                      l = this.l >> 2;
                      blockposition = this.a(new BlockPosition(j + (l & 15), 0, k + (l >> 8 & 15)));
 -- 
-2.8.0
+2.7.4
 

Spigot-Server-Patches/0043-Disable-ice-and-snow.patch

@@ -1,14 +1,14 @@
-From d65be532ca3364948e131e0362ae3937f6ad3d32 Mon Sep 17 00:00:00 2001
+From 8b3dce7e7e4fcb9a778f027e15d1f22ba86ccfa9 Mon Sep 17 00:00:00 2001
 From: Sudzzy <originmc@outlook.com>
 Date: Wed, 2 Mar 2016 14:57:24 -0600
 Subject: [PATCH] Disable ice and snow
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index a665e3a..41b2a42 100644
+index 1a341d8..d8bc932 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -231,4 +231,9 @@ public class PaperWorldConfig {
+@@ -221,4 +221,9 @@ public class PaperWorldConfig {
      private void disableThunder() {
          disableThunder = getBoolean("disable-thunder", false);
      }
@@ -32,5 +32,5 @@ index 94b5c37..47dbea8 100644
                      l = this.l >> 2;
                      blockposition = this.p(new BlockPosition(j + (l & 15), 0, k + (l >> 8 & 15)));
 -- 
-2.8.0
+2.7.4
 

Spigot-Server-Patches/0044-Configurable-mob-spawner-tick-rate.patch

@@ -1,14 +1,14 @@
-From 69f769aa7facf3d6ea3367c6b9fdb6f0ff7322e3 Mon Sep 17 00:00:00 2001
+From bf6c80f0836eb5a5a4f7443a6fd00022c4dd18ad Mon Sep 17 00:00:00 2001
 From: Sudzzy <originmc@outlook.com>
 Date: Wed, 2 Mar 2016 15:03:53 -0600
 Subject: [PATCH] Configurable mob spawner tick rate
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 41b2a42..1236128 100644
+index d8bc932..7028730 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -236,4 +236,9 @@ public class PaperWorldConfig {
+@@ -226,4 +226,9 @@ public class PaperWorldConfig {
      private void disableIceAndSnow(){
          disableIceAndSnow = getBoolean("disable-ice-and-snow", false);
      }
@@ -64,5 +64,5 @@ index 2eee845..f4f77d7 100644
                  }
  
 -- 
-2.8.0
+2.7.4
 

Spigot-Server-Patches/0045-Configurable-TNT-cannon-fix.patch

@@ -1,14 +1,14 @@
-From 45c9d527168cc83dafaa5f8f4c2b33b789fbdd79 Mon Sep 17 00:00:00 2001
+From 47c10005c1cb4d456fedc26eaf6d8c4747204527 Mon Sep 17 00:00:00 2001
 From: Iceee <andrew@opticgaming.tv>
 Date: Wed, 2 Mar 2016 23:00:53 -0600
 Subject: [PATCH] Configurable TNT cannon fix
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 1236128..8d97890 100644
+index 7028730..abed8ea 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -241,4 +241,10 @@ public class PaperWorldConfig {
+@@ -231,4 +231,10 @@ public class PaperWorldConfig {
      private void mobSpawnerTickRate() {
          mobSpawnerTickRate = getInt("mob-spawner-tick-rate", 1);
      }
@@ -315,5 +315,5 @@ index 91540c7..209b470 100644
                              EntityHuman entityhuman = (EntityHuman) entity;
  
 -- 
-2.8.0
+2.7.4
 

Spigot-Server-Patches/0048-Configurable-container-update-tick-rate.patch

@@ -1,14 +1,14 @@
-From bd05644ab0f98384fc8793dd89ef321a99e3306e Mon Sep 17 00:00:00 2001
+From 110bf1e5d3f0fae847488faaabb4e5aacce9c575 Mon Sep 17 00:00:00 2001
 From: Sudzzy <originmc@outlook.com>
 Date: Wed, 2 Mar 2016 23:34:44 -0600
 Subject: [PATCH] Configurable container update tick rate
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 8d97890..91eb5de 100644
+index abed8ea..8b76052 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -247,4 +247,9 @@ public class PaperWorldConfig {
+@@ -237,4 +237,9 @@ public class PaperWorldConfig {
          fixCannons = getBoolean("fix-cannons", false);
          log("Fix TNT cannons: " + fixCannons);
      }
@@ -45,5 +45,5 @@ index ed307bc..2681aa5 100644
              this.closeInventory();
              this.activeContainer = this.defaultContainer;
 -- 
-2.8.0
+2.7.4
 

Spigot-Server-Patches/0058-Disable-chest-cat-detection.patch

@@ -1,14 +1,14 @@
-From dc5bbfacc8f4f564722ac6a0e89cebf5b2afff74 Mon Sep 17 00:00:00 2001
+From f34313fe66f90655773a67b57c2975136ed7197e Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 3 Mar 2016 01:13:45 -0600
 Subject: [PATCH] Disable chest cat detection
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 91eb5de..d5a1c47 100644
+index 8b76052..7fe2ab0 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -252,4 +252,9 @@ public class PaperWorldConfig {
+@@ -242,4 +242,9 @@ public class PaperWorldConfig {
      private void containerUpdateTickRate() {
          containerUpdateTickRate = getInt("container-update-tick-rate", 1);
      }
@@ -35,5 +35,5 @@ index 2fb9c76..5143d9e 100644
  
          EntityOcelot entityocelot;
 -- 
-2.8.0
+2.7.4
 

Spigot-Server-Patches/0060-All-chunks-are-slime-spawn-chunks-toggle.patch

@@ -1,14 +1,14 @@
-From 3f3eba49196fa43733c35773683d09bbd34952d4 Mon Sep 17 00:00:00 2001
+From bbb75b5bf0779e9a2f7c2033582a58de026b30ac Mon Sep 17 00:00:00 2001
 From: vemacs <d@nkmem.es>
 Date: Thu, 3 Mar 2016 01:19:22 -0600
 Subject: [PATCH] All chunks are slime spawn chunks toggle
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index d5a1c47..1f97e59 100644
+index 7fe2ab0..0e03d9a 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -257,4 +257,9 @@ public class PaperWorldConfig {
+@@ -247,4 +247,9 @@ public class PaperWorldConfig {
      private void disableChestCatDetection() {
          disableChestCatDetection = getBoolean("game-mechanics.disable-chest-cat-detection", false);
      }
@@ -33,5 +33,5 @@ index fbefa3e..da73220 100644
                  }
              }
 -- 
-2.8.0
+2.7.4
 

Spigot-Server-Patches/0061-Add-Location-support-to-tab-completers-vanilla-featu.patch

@@ -1,4 +1,4 @@
-From 629b40a00252fba89e0cd179b07eea9ed168b7db Mon Sep 17 00:00:00 2001
+From db45502c0c844aea58ac4edf86dc3d1da394d429 Mon Sep 17 00:00:00 2001
 From: DemonWav <demonwav@gmail.com>
 Date: Thu, 3 Mar 2016 01:44:39 -0600
 Subject: [PATCH] Add Location support to tab completers (vanilla feature
@@ -6,10 +6,10 @@ Subject: [PATCH] Add Location support to tab completers (vanilla feature
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 1f97e59..ca11cd7 100644
+index 0e03d9a..a73542d 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -262,4 +262,9 @@ public class PaperWorldConfig {
+@@ -252,4 +252,9 @@ public class PaperWorldConfig {
      private void allChunksAreSlimeChunks() {
          allChunksAreSlimeChunks = getBoolean("all-chunks-are-slime-chunks", false);
      }
@@ -151,5 +151,5 @@ index 100d84a..a40218c 100644
  
      public static CommandSender lastSender = null; // Nasty :(
 -- 
-2.8.0
+2.7.4
 

Spigot-Server-Patches/0072-Add-configurable-portal-search-radius.patch

@@ -1,14 +1,14 @@
-From bfe20a3b2501f9c79626f645784920ac0b2c5950 Mon Sep 17 00:00:00 2001
+From 94d4c317f969d0991de45bf7862c4f3dff46eed0 Mon Sep 17 00:00:00 2001
 From: Joseph Hirschfeld <joe@ibj.io>
 Date: Thu, 3 Mar 2016 02:46:17 -0600
 Subject: [PATCH] Add configurable portal search radius
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index ca11cd7..c245599 100644
+index a73542d..f1ffe7b 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -267,4 +267,9 @@ public class PaperWorldConfig {
+@@ -257,4 +257,9 @@ public class PaperWorldConfig {
      private void allowBlockLocationTabCompletion() {
          allowBlockLocationTabCompletion = getBoolean("allow-block-location-tab-completion", true);
      }
@@ -54,5 +54,5 @@ index 1d5dce1..7ca2617 100644
      private boolean canCreatePortal = true;
  
 -- 
-2.8.0
+2.7.4
 

Spigot-Server-Patches/0074-Fix-inter-world-teleportation-glitches.patch

@@ -1,4 +1,4 @@
-From 25ea05e9420d42f53a771cd2e20bd36aef0cd92f Mon Sep 17 00:00:00 2001
+From a92e9dc6bd64f98155825c6c51c3bce4c85de650 Mon Sep 17 00:00:00 2001
 From: Sudzzy <originmc@outlook.com>
 Date: Thu, 3 Mar 2016 02:50:31 -0600
 Subject: [PATCH] Fix inter-world teleportation glitches
@@ -11,10 +11,10 @@ Example setup to perform the glitch: http://puu.sh/ng3PC/cf072dcbdb.png
 The wanted destination was on top of the emerald block however the player ended on top of the diamond block. This only is the case if the player is teleporting between worlds.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index c245599..75b22fa 100644
+index f1ffe7b..c6f12a1 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -272,4 +272,9 @@ public class PaperWorldConfig {
+@@ -262,4 +262,9 @@ public class PaperWorldConfig {
      private void portalSearchRadius() {
          portalSearchRadius = getInt("portal-search-radius", 128);
      }
@@ -39,5 +39,5 @@ index 609f7ea..2f86dd3 100644
          return true;
      }
 -- 
-2.8.0
+2.7.4
 

Spigot-Server-Patches/0078-Disable-Scoreboards-for-non-players-by-default.patch

@@ -1,4 +1,4 @@
-From 1987bc0cc04d03eb767e4703072b066c4b473af0 Mon Sep 17 00:00:00 2001
+From 474aba78994def117b1c40b2565d8520173af652 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 8 Mar 2016 23:25:45 -0500
 Subject: [PATCH] Disable Scoreboards for non players by default
@@ -11,10 +11,10 @@ So avoid looking up scoreboards and short circuit to the "not on a team"
 logic which is most likely to be true.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 75b22fa..f967ec0 100644
+index c6f12a1..b813a9b 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -277,4 +277,9 @@ public class PaperWorldConfig {
+@@ -267,4 +267,9 @@ public class PaperWorldConfig {
      private void disableTeleportationSuffocationCheck() {
          disableTeleportationSuffocationCheck = getBoolean("disable-teleportation-suffocation-check", false);
      }
@@ -49,5 +49,5 @@ index 282a14f..3ded885 100644
      }
  
 -- 
-2.8.0
+2.7.4
 

Spigot-Server-Patches/0081-Re-add-Spigot-s-hopper-check-feature.patch

@@ -1,14 +1,14 @@
-From 3b10847113aae94f27ea2d6787aa6dd2428fb26a Mon Sep 17 00:00:00 2001
+From 01031212772eb916a2c3f5d05c30f93302c019d3 Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Sat, 12 Mar 2016 13:37:50 -0600
 Subject: [PATCH] Re-add Spigot's hopper-check feature
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index f967ec0..4d6e5fc 100644
+index b813a9b..9e91991 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -282,4 +282,9 @@ public class PaperWorldConfig {
+@@ -272,4 +272,9 @@ public class PaperWorldConfig {
      private void nonPlayerEntitiesOnScoreboards() {
          nonPlayerEntitiesOnScoreboards = getBoolean("allow-non-player-entities-on-scoreboards", false);
      }
@@ -36,5 +36,5 @@ index b2f0c18..243da36 100644
              return false;
          } else {
 -- 
-2.8.0
+2.7.4
 

Spigot-Server-Patches/0087-Undead-horse-leashing.patch

@@ -1,4 +1,4 @@
-From 6bd67621d6773a3127b55f78fd1b30a3b639a315 Mon Sep 17 00:00:00 2001
+From 7319c93dfc5a4556ead4fe14f8ae18a24d85382c Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 18 Mar 2016 14:19:19 -0400
 Subject: [PATCH] Undead horse leashing
@@ -6,10 +6,10 @@ Subject: [PATCH] Undead horse leashing
 default false to match vanilla, but option to allow undead horse types to be leashed.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 4d6e5fc..38f94ce 100644
+index 9e91991..03dd637 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -287,4 +287,9 @@ public class PaperWorldConfig {
+@@ -277,4 +277,9 @@ public class PaperWorldConfig {
      private void useHopperCheck() {
          useHopperCheck = getBoolean("use-hopper-check", false);
      }
@@ -32,5 +32,5 @@ index a81bf3b..8367458 100644
      }
  
 -- 
-2.8.0
+2.7.4
 

Spigot-Server-Patches/0090-Configurable-Non-Player-Arrow-Despawn-Rate.patch

@@ -1,4 +1,4 @@
-From ab8ab4ef84ffa10baf61b44d14a4cc73445dab32 Mon Sep 17 00:00:00 2001
+From 82efce5c51baa8cacf7b226959f61fe8feedd393 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 18 Mar 2016 15:12:22 -0400
 Subject: [PATCH] Configurable Non Player Arrow Despawn Rate
@@ -6,10 +6,10 @@ Subject: [PATCH] Configurable Non Player Arrow Despawn Rate
 Can set a much shorter despawn rate for arrows that players can not pick up.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 38f94ce..7d8a541 100644
+index 03dd637..26c1b72 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -292,4 +292,13 @@ public class PaperWorldConfig {
+@@ -282,4 +282,13 @@ public class PaperWorldConfig {
      private void allowLeashingUndeadHorse() {
          allowLeashingUndeadHorse = getBoolean("allow-leashing-undead-horse", false);
      }
@@ -37,5 +37,5 @@ index 7a4f56d..a073e6c 100644
                  }
              } else {
 -- 
-2.8.0
+2.7.4
 

Spigot-Server-Patches/0106-Configurable-spawn-chances-for-skeleton-horses.patch

@@ -1,14 +1,14 @@
-From 52834641965d3823b1d464616db2fb9bbc27e597 Mon Sep 17 00:00:00 2001
+From d5b3a0eaf851f658b423b98f759603d1c8ed763f Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Tue, 22 Mar 2016 12:04:28 -0500
 Subject: [PATCH] Configurable spawn chances for skeleton horses
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 7d8a541..66ba48a 100644
+index 26c1b72..55b211e 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -301,4 +301,9 @@ public class PaperWorldConfig {
+@@ -291,4 +291,9 @@ public class PaperWorldConfig {
          }
          log("Non Player Arrow Despawn Rate: " + nonPlayerArrowDespawnRate);
      }
@@ -35,5 +35,5 @@ index b859c51..fd1150b 100644
  
                              entityhorse.setType(EnumHorseType.SKELETON);
 -- 
-2.8.0
+2.7.4
 

Spigot-Server-Patches/0114-Option-to-disable-BlockPhysicsEvent-for-Redstone.patch

@@ -1,4 +1,4 @@
-From 4813940c2a3f49cc5656021b86802fad492efc17 Mon Sep 17 00:00:00 2001
+From 7624eaca661b3e694061922c8117852adae8f5be Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 28 Mar 2016 19:55:45 -0400
 Subject: [PATCH] Option to disable BlockPhysicsEvent for Redstone
@@ -11,10 +11,10 @@ Defaulting this to false will provide substantial performance improvement
 by saving millions of event calls on redstone heavy servers.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 66ba48a..2740906 100644
+index 55b211e..d6b8f72 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -306,4 +306,9 @@ public class PaperWorldConfig {
+@@ -296,4 +296,9 @@ public class PaperWorldConfig {
      private void skeleHorseSpawnChance() {
          skeleHorseSpawnChance = getDouble("skeleton-horse-thunder-spawn-chance", -1.0D); // -1.0D represents a "vanilla" state
      }
@@ -67,5 +67,5 @@ index fd1150b..f170d7a 100644
                          timing.stopTiming(); // Paper
                      } else {
 -- 
-2.8.0
+2.7.4
 

Spigot-Server-Patches/0116-Configurable-Chunk-Inhabited-Timer.patch

@@ -1,4 +1,4 @@
-From 9f0319957909bbe303e1e8e7a3163b3ef550ef66 Mon Sep 17 00:00:00 2001
+From 3a99b17cfd36737d13c8a3b6efe419c94f2aaed2 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 28 Mar 2016 20:46:14 -0400
 Subject: [PATCH] Configurable Chunk Inhabited Timer
@@ -9,10 +9,10 @@ aspects of vanilla gameplay to this factor.
 For people who want all chunks to be treated equally, you can disable the timer.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 2740906..623bad2 100644
+index d6b8f72..44a33ee 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -311,4 +311,9 @@ public class PaperWorldConfig {
+@@ -301,4 +301,9 @@ public class PaperWorldConfig {
      private void firePhysicsEventForRedstone() {
          firePhysicsEventForRedstone = getBoolean("fire-physics-event-for-redstone", firePhysicsEventForRedstone);
      }
@@ -36,5 +36,5 @@ index 6e3d17b..9334a0a 100644
  
      public void c(long i) {
 -- 
-2.8.0
+2.7.4