From a4647a8a713f07e7d2bdde8da5696348a5fe3df3 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sun, 17 Aug 2014 16:47:36 -0500 Subject: [PATCH] Update from upstream SpigotMC Fix empty `ench` tags being wiped by the meta system SpigotMC/Spigot@cc9a1a417f1ac95a7957db8636e31c8fc2baf4e9 Add Hunger Config Values SpigotMC/Spigot@2cd515e2241947e3f9a11d6975c2d657360f7acd Make debug logging togglable SpigotMC/Spigot@d31b1d616fe2c16bd3609d6f632826e05bc505e9 Spigot has implemented a system of hunger exhaustion similar to ours, as such a lot of config values have been moved there. Our exhaustion patch has been trimmed and only a few values for exhaustion remain in paper.yml, the others now sit in spigot.yml --- ... => 0163-Alternative-Hopper-Ticking.patch} | 4 +- ...163-Log-debug-levels-to-the-log-file.patch | 30 ------ ...Apply-NBTReadLimiter-to-more-things.patch} | 2 +- ...tch => 0165-Allow-Attribute-Capping.patch} | 2 +- ...-a-global-cache-for-any-request-on-.patch} | 2 +- ...fetch-an-online-UUID-in-online-mode.patch} | 2 +- ...modifiers-which-cause-the-attribute.patch} | 2 +- ...ed-diff-from-Minecraft-1.3.1-update.patch} | 2 +- ..._AIR-detection-when-not-in-creative.patch} | 2 +- ...h => 0171-Plug-WorldMap-Memory-Leak.patch} | 2 +- ... 0172-Force-Close-Inventory-On-Move.patch} | 2 +- ...=> 0173-Fix-Corrupted-Trapped-Chest.patch} | 2 +- .../0174-Remove-uneeded-validation.patch | 38 ++++++++ .../0175-Add-Hunger-Config-Values.patch | 68 +++++++++++++ .../0176-Make-debug-logging-togglable.patch | 67 +++++++++++++ .../0022-Player-Exhaustion-Multipliers.patch | 96 ++++--------------- ...-despawn-distances-for-living-entiti.patch | 10 +- ...4-Allow-for-toggling-of-spawn-chunks.patch | 8 +- ...ck-entities-that-are-above-the-speci.patch | 6 +- ...e-speed-for-water-flowing-over-lava.patch} | 6 +- .../0028-Don-t-log-debug-information.patch | 33 ------- ... 0029-Center-TNT-grid-sample-points.patch} | 2 +- ...=> 0030-Player-affects-spawning-API.patch} | 4 +- ...h => 0031-Configurable-hanging-tick.patch} | 6 +- ...sts.patch => 0032-Don-t-tick-chests.patch} | 2 +- 25 files changed, 226 insertions(+), 174 deletions(-) rename CraftBukkit-Patches/{0164-Alternative-Hopper-Ticking.patch => 0163-Alternative-Hopper-Ticking.patch} (99%) delete mode 100644 CraftBukkit-Patches/0163-Log-debug-levels-to-the-log-file.patch rename CraftBukkit-Patches/{0165-Apply-NBTReadLimiter-to-more-things.patch => 0164-Apply-NBTReadLimiter-to-more-things.patch} (96%) rename CraftBukkit-Patches/{0166-Allow-Attribute-Capping.patch => 0165-Allow-Attribute-Capping.patch} (98%) rename CraftBukkit-Patches/{0167-Add-an-option-for-a-global-cache-for-any-request-on-.patch => 0166-Add-an-option-for-a-global-cache-for-any-request-on-.patch} (99%) rename CraftBukkit-Patches/{0168-Only-fetch-an-online-UUID-in-online-mode.patch => 0167-Only-fetch-an-online-UUID-in-online-mode.patch} (96%) rename CraftBukkit-Patches/{0169-Filter-attribute-modifiers-which-cause-the-attribute.patch => 0168-Filter-attribute-modifiers-which-cause-the-attribute.patch} (99%) rename CraftBukkit-Patches/{0170-Fix-missed-diff-from-Minecraft-1.3.1-update.patch => 0169-Fix-missed-diff-from-Minecraft-1.3.1-update.patch} (93%) rename CraftBukkit-Patches/{0171-Fix-LEFT_CLICK_AIR-detection-when-not-in-creative.patch => 0170-Fix-LEFT_CLICK_AIR-detection-when-not-in-creative.patch} (94%) rename CraftBukkit-Patches/{0172-Plug-WorldMap-Memory-Leak.patch => 0171-Plug-WorldMap-Memory-Leak.patch} (97%) rename CraftBukkit-Patches/{0173-Force-Close-Inventory-On-Move.patch => 0172-Force-Close-Inventory-On-Move.patch} (96%) rename CraftBukkit-Patches/{0174-Fix-Corrupted-Trapped-Chest.patch => 0173-Fix-Corrupted-Trapped-Chest.patch} (94%) create mode 100644 CraftBukkit-Patches/0174-Remove-uneeded-validation.patch create mode 100644 CraftBukkit-Patches/0175-Add-Hunger-Config-Values.patch create mode 100644 CraftBukkit-Patches/0176-Make-debug-logging-togglable.patch rename Spigot-Server-Patches/{0029-Configurable-speed-for-water-flowing-over-lava.patch => 0028-Configurable-speed-for-water-flowing-over-lava.patch} (94%) delete mode 100644 Spigot-Server-Patches/0028-Don-t-log-debug-information.patch rename Spigot-Server-Patches/{0030-Center-TNT-grid-sample-points.patch => 0029-Center-TNT-grid-sample-points.patch} (96%) rename Spigot-Server-Patches/{0031-Player-affects-spawning-API.patch => 0030-Player-affects-spawning-API.patch} (98%) rename Spigot-Server-Patches/{0032-Configurable-hanging-tick.patch => 0031-Configurable-hanging-tick.patch} (91%) rename Spigot-Server-Patches/{0033-Don-t-tick-chests.patch => 0032-Don-t-tick-chests.patch} (97%) diff --git a/CraftBukkit-Patches/0164-Alternative-Hopper-Ticking.patch b/CraftBukkit-Patches/0163-Alternative-Hopper-Ticking.patch similarity index 99% rename from CraftBukkit-Patches/0164-Alternative-Hopper-Ticking.patch rename to CraftBukkit-Patches/0163-Alternative-Hopper-Ticking.patch index cb3c325edd..6f38591af6 100644 --- a/CraftBukkit-Patches/0164-Alternative-Hopper-Ticking.patch +++ b/CraftBukkit-Patches/0163-Alternative-Hopper-Ticking.patch @@ -1,4 +1,4 @@ -From ae9b5ac4a377b7491baef642727e1c46d2636bee Mon Sep 17 00:00:00 2001 +From 924c5dc46c27c82e5ec888ef859514316ab8261b Mon Sep 17 00:00:00 2001 From: "Evan A. Haskell" Date: Sat, 19 Apr 2014 16:58:26 -0400 Subject: [PATCH] Alternative Hopper Ticking @@ -45,7 +45,7 @@ index b85b72f..b33ed64 100644 + // Spigot end } diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java -index 5641ad7..406aead 100644 +index cbcc9e9..0423ee9 100644 --- a/src/main/java/net/minecraft/server/Chunk.java +++ b/src/main/java/net/minecraft/server/Chunk.java @@ -750,6 +750,11 @@ public class Chunk { diff --git a/CraftBukkit-Patches/0163-Log-debug-levels-to-the-log-file.patch b/CraftBukkit-Patches/0163-Log-debug-levels-to-the-log-file.patch deleted file mode 100644 index 3b16941979..0000000000 --- a/CraftBukkit-Patches/0163-Log-debug-levels-to-the-log-file.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 20a4b5d5d28823990a3a0b43219322907cc2d936 Mon Sep 17 00:00:00 2001 -From: Minecrell -Date: Thu, 24 Jul 2014 13:18:36 +0200 -Subject: [PATCH] Log debug levels to the log file. - - -diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml -index e2209b8..adc0181 100644 ---- a/src/main/resources/log4j2.xml -+++ b/src/main/resources/log4j2.xml -@@ -14,13 +14,13 @@ - - - -- -+ - - - -- -+ - -- -+ - - - --- -1.9.1 - diff --git a/CraftBukkit-Patches/0165-Apply-NBTReadLimiter-to-more-things.patch b/CraftBukkit-Patches/0164-Apply-NBTReadLimiter-to-more-things.patch similarity index 96% rename from CraftBukkit-Patches/0165-Apply-NBTReadLimiter-to-more-things.patch rename to CraftBukkit-Patches/0164-Apply-NBTReadLimiter-to-more-things.patch index 8f09bae182..ac38c98ee9 100644 --- a/CraftBukkit-Patches/0165-Apply-NBTReadLimiter-to-more-things.patch +++ b/CraftBukkit-Patches/0164-Apply-NBTReadLimiter-to-more-things.patch @@ -1,4 +1,4 @@ -From e31b524ba7d6dee439a342096ddf01ac026985ea Mon Sep 17 00:00:00 2001 +From d3491f6de596ea5a2b9a715094953c1a43433e42 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 27 Jul 2014 20:46:04 +1000 Subject: [PATCH] Apply NBTReadLimiter to more things. diff --git a/CraftBukkit-Patches/0166-Allow-Attribute-Capping.patch b/CraftBukkit-Patches/0165-Allow-Attribute-Capping.patch similarity index 98% rename from CraftBukkit-Patches/0166-Allow-Attribute-Capping.patch rename to CraftBukkit-Patches/0165-Allow-Attribute-Capping.patch index cac4a1feba..8807f27d48 100644 --- a/CraftBukkit-Patches/0166-Allow-Attribute-Capping.patch +++ b/CraftBukkit-Patches/0165-Allow-Attribute-Capping.patch @@ -1,4 +1,4 @@ -From 2e52f5674fe8513833304c4234b0f58c318c3ce3 Mon Sep 17 00:00:00 2001 +From a6fb28006bebb043851422b8ab7c27b924c041c6 Mon Sep 17 00:00:00 2001 From: md_5 Date: Mon, 28 Jul 2014 16:55:51 +1000 Subject: [PATCH] Allow Attribute Capping. diff --git a/CraftBukkit-Patches/0167-Add-an-option-for-a-global-cache-for-any-request-on-.patch b/CraftBukkit-Patches/0166-Add-an-option-for-a-global-cache-for-any-request-on-.patch similarity index 99% rename from CraftBukkit-Patches/0167-Add-an-option-for-a-global-cache-for-any-request-on-.patch rename to CraftBukkit-Patches/0166-Add-an-option-for-a-global-cache-for-any-request-on-.patch index 5f9333e4f0..e60faea2a0 100644 --- a/CraftBukkit-Patches/0167-Add-an-option-for-a-global-cache-for-any-request-on-.patch +++ b/CraftBukkit-Patches/0166-Add-an-option-for-a-global-cache-for-any-request-on-.patch @@ -1,4 +1,4 @@ -From e87f59391db7d6cc2552b22d8e946800962ead28 Mon Sep 17 00:00:00 2001 +From 129f58f3f8ba975fbe8a487f45b0dce22c229b88 Mon Sep 17 00:00:00 2001 From: Thinkofdeath Date: Mon, 28 Jul 2014 11:42:11 +0100 Subject: [PATCH] Add an option for a global cache for any request on Mojang's diff --git a/CraftBukkit-Patches/0168-Only-fetch-an-online-UUID-in-online-mode.patch b/CraftBukkit-Patches/0167-Only-fetch-an-online-UUID-in-online-mode.patch similarity index 96% rename from CraftBukkit-Patches/0168-Only-fetch-an-online-UUID-in-online-mode.patch rename to CraftBukkit-Patches/0167-Only-fetch-an-online-UUID-in-online-mode.patch index 6ef5cad47d..0f38f30b36 100644 --- a/CraftBukkit-Patches/0168-Only-fetch-an-online-UUID-in-online-mode.patch +++ b/CraftBukkit-Patches/0167-Only-fetch-an-online-UUID-in-online-mode.patch @@ -1,4 +1,4 @@ -From 67b3c5662e7681b4f8db81e16fd9250509eb18fa Mon Sep 17 00:00:00 2001 +From 9ca6ab77b96d4f00ed0f5361bbf0a92957de9722 Mon Sep 17 00:00:00 2001 From: Maxim Van de Wynckel Date: Wed, 30 Jul 2014 01:19:51 +0200 Subject: [PATCH] Only fetch an online UUID in online mode diff --git a/CraftBukkit-Patches/0169-Filter-attribute-modifiers-which-cause-the-attribute.patch b/CraftBukkit-Patches/0168-Filter-attribute-modifiers-which-cause-the-attribute.patch similarity index 99% rename from CraftBukkit-Patches/0169-Filter-attribute-modifiers-which-cause-the-attribute.patch rename to CraftBukkit-Patches/0168-Filter-attribute-modifiers-which-cause-the-attribute.patch index 0bde241a1c..b0f521643c 100644 --- a/CraftBukkit-Patches/0169-Filter-attribute-modifiers-which-cause-the-attribute.patch +++ b/CraftBukkit-Patches/0168-Filter-attribute-modifiers-which-cause-the-attribute.patch @@ -1,4 +1,4 @@ -From 79ea596dbf0fd1be612242139bb967e3687df8e1 Mon Sep 17 00:00:00 2001 +From 7f6272db9e5c1da260a12fd22fc34a0f6aa25af3 Mon Sep 17 00:00:00 2001 From: Thinkofdeath Date: Thu, 31 Jul 2014 17:48:20 +0100 Subject: [PATCH] Filter attribute modifiers which cause the attribute to go diff --git a/CraftBukkit-Patches/0170-Fix-missed-diff-from-Minecraft-1.3.1-update.patch b/CraftBukkit-Patches/0169-Fix-missed-diff-from-Minecraft-1.3.1-update.patch similarity index 93% rename from CraftBukkit-Patches/0170-Fix-missed-diff-from-Minecraft-1.3.1-update.patch rename to CraftBukkit-Patches/0169-Fix-missed-diff-from-Minecraft-1.3.1-update.patch index 118f86316b..f1dc21492c 100644 --- a/CraftBukkit-Patches/0170-Fix-missed-diff-from-Minecraft-1.3.1-update.patch +++ b/CraftBukkit-Patches/0169-Fix-missed-diff-from-Minecraft-1.3.1-update.patch @@ -1,4 +1,4 @@ -From 0102dc4e41312fdd63c4518b142462d1c851b3c4 Mon Sep 17 00:00:00 2001 +From dac5ed48c55e2ea70288e118a9f2d2043fe4bb8d Mon Sep 17 00:00:00 2001 From: mrapple Date: Thu, 31 Jul 2014 20:05:06 -0500 Subject: [PATCH] Fix missed diff from Minecraft 1.3.1 update diff --git a/CraftBukkit-Patches/0171-Fix-LEFT_CLICK_AIR-detection-when-not-in-creative.patch b/CraftBukkit-Patches/0170-Fix-LEFT_CLICK_AIR-detection-when-not-in-creative.patch similarity index 94% rename from CraftBukkit-Patches/0171-Fix-LEFT_CLICK_AIR-detection-when-not-in-creative.patch rename to CraftBukkit-Patches/0170-Fix-LEFT_CLICK_AIR-detection-when-not-in-creative.patch index 8b6a849d1a..7b96439178 100644 --- a/CraftBukkit-Patches/0171-Fix-LEFT_CLICK_AIR-detection-when-not-in-creative.patch +++ b/CraftBukkit-Patches/0170-Fix-LEFT_CLICK_AIR-detection-when-not-in-creative.patch @@ -1,4 +1,4 @@ -From 98658d64599b2521538967a27f90d50f8347d92c Mon Sep 17 00:00:00 2001 +From a351c5f393f924a68d20575d7a57815f3ba959c7 Mon Sep 17 00:00:00 2001 From: Thinkofdeath Date: Thu, 7 Aug 2014 15:48:33 +0100 Subject: [PATCH] Fix LEFT_CLICK_AIR detection when not in creative diff --git a/CraftBukkit-Patches/0172-Plug-WorldMap-Memory-Leak.patch b/CraftBukkit-Patches/0171-Plug-WorldMap-Memory-Leak.patch similarity index 97% rename from CraftBukkit-Patches/0172-Plug-WorldMap-Memory-Leak.patch rename to CraftBukkit-Patches/0171-Plug-WorldMap-Memory-Leak.patch index 45edcd7519..b26d79e67e 100644 --- a/CraftBukkit-Patches/0172-Plug-WorldMap-Memory-Leak.patch +++ b/CraftBukkit-Patches/0171-Plug-WorldMap-Memory-Leak.patch @@ -1,4 +1,4 @@ -From cda57ced6f737f807bc0a8cc9ecd00a56389c877 Mon Sep 17 00:00:00 2001 +From 7ca7779b28c1c0c64547972c419251ab682804d9 Mon Sep 17 00:00:00 2001 From: md_5 Date: Fri, 8 Aug 2014 19:57:03 +1000 Subject: [PATCH] Plug WorldMap Memory Leak diff --git a/CraftBukkit-Patches/0173-Force-Close-Inventory-On-Move.patch b/CraftBukkit-Patches/0172-Force-Close-Inventory-On-Move.patch similarity index 96% rename from CraftBukkit-Patches/0173-Force-Close-Inventory-On-Move.patch rename to CraftBukkit-Patches/0172-Force-Close-Inventory-On-Move.patch index f977dfc634..d29fa2b48d 100644 --- a/CraftBukkit-Patches/0173-Force-Close-Inventory-On-Move.patch +++ b/CraftBukkit-Patches/0172-Force-Close-Inventory-On-Move.patch @@ -1,4 +1,4 @@ -From c9d9a1ae8bc827c6b3128bf8fa74cc260ac9adec Mon Sep 17 00:00:00 2001 +From cbfc57150639ba9254c567c4391904aa5ba6967b Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 10 Aug 2014 11:01:02 +1000 Subject: [PATCH] Force Close Inventory On Move diff --git a/CraftBukkit-Patches/0174-Fix-Corrupted-Trapped-Chest.patch b/CraftBukkit-Patches/0173-Fix-Corrupted-Trapped-Chest.patch similarity index 94% rename from CraftBukkit-Patches/0174-Fix-Corrupted-Trapped-Chest.patch rename to CraftBukkit-Patches/0173-Fix-Corrupted-Trapped-Chest.patch index e78e4a274b..d96ce79559 100644 --- a/CraftBukkit-Patches/0174-Fix-Corrupted-Trapped-Chest.patch +++ b/CraftBukkit-Patches/0173-Fix-Corrupted-Trapped-Chest.patch @@ -1,4 +1,4 @@ -From baa91fa0bb4aee82819f9ccb4aa2f6c8889365ca Mon Sep 17 00:00:00 2001 +From d3ad925d2b1ffcdab030cf892d231596d8493558 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 15 Aug 2014 00:56:41 -0400 Subject: [PATCH] Fix Corrupted Trapped Chest diff --git a/CraftBukkit-Patches/0174-Remove-uneeded-validation.patch b/CraftBukkit-Patches/0174-Remove-uneeded-validation.patch new file mode 100644 index 0000000000..204fa47ab9 --- /dev/null +++ b/CraftBukkit-Patches/0174-Remove-uneeded-validation.patch @@ -0,0 +1,38 @@ +From b977d6e326ccdabb10e3d7af880b08f91be60911 Mon Sep 17 00:00:00 2001 +From: drXor +Date: Fri, 15 Aug 2014 18:11:09 -0400 +Subject: [PATCH] Remove uneeded validation + + +diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java +index bcde85c..adaac09 100644 +--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java ++++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java +@@ -509,7 +509,7 @@ class CraftMetaItem implements ItemMeta, Repairable { + } + + static void applyEnchantments(Map enchantments, NBTTagCompound tag, ItemMetaKey key) { +- if (enchantments == null || enchantments.size() == 0) { ++ if (enchantments == null /*|| enchantments.size() == 0*/) { // Spigot - remove size check + return; + } + +@@ -600,7 +600,14 @@ class CraftMetaItem implements ItemMeta, Repairable { + } + + public boolean removeEnchant(Enchantment ench) { +- return hasEnchants() && enchantments.remove(ench) != null; ++ // Spigot start ++ boolean b = hasEnchants() && enchantments.remove( ench ) != null; ++ if ( enchantments != null && enchantments.isEmpty() ) ++ { ++ this.enchantments = null; ++ } ++ return b; ++ // Spigot end + } + + public boolean hasEnchants() { +-- +1.9.1 + diff --git a/CraftBukkit-Patches/0175-Add-Hunger-Config-Values.patch b/CraftBukkit-Patches/0175-Add-Hunger-Config-Values.patch new file mode 100644 index 0000000000..424cd3d5c3 --- /dev/null +++ b/CraftBukkit-Patches/0175-Add-Hunger-Config-Values.patch @@ -0,0 +1,68 @@ +From 8a5b07ff394ea730f43b69c19c4500f542f505f4 Mon Sep 17 00:00:00 2001 +From: lazertester +Date: Sun, 17 Aug 2014 19:56:17 +1000 +Subject: [PATCH] Add Hunger Config Values + + +diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java +index f3e4328..219eb5f 100644 +--- a/src/main/java/net/minecraft/server/EntityHuman.java ++++ b/src/main/java/net/minecraft/server/EntityHuman.java +@@ -1006,7 +1006,7 @@ public abstract class EntityHuman extends EntityLiving implements ICommandListen + } + } + +- this.applyExhaustion(0.3F); ++ this.applyExhaustion(world.spigotConfig.combatExhaustion); // Spigot - Change to use configurable value + } else if (flag1) { + entity.extinguish(); + } +@@ -1266,9 +1266,9 @@ public abstract class EntityHuman extends EntityLiving implements ICommandListen + super.bj(); + this.a(StatisticList.r, 1); + if (this.isSprinting()) { +- this.applyExhaustion(0.8F); ++ this.applyExhaustion(world.spigotConfig.sprintExhaustion); // Spigot - Change to use configurable value + } else { +- this.applyExhaustion(0.2F); ++ this.applyExhaustion(world.spigotConfig.walkExhaustion); // Spigot - Change to use configurable value + } + } + +diff --git a/src/main/java/net/minecraft/server/FoodMetaData.java b/src/main/java/net/minecraft/server/FoodMetaData.java +index 4169231..4a7f1e5 100644 +--- a/src/main/java/net/minecraft/server/FoodMetaData.java ++++ b/src/main/java/net/minecraft/server/FoodMetaData.java +@@ -65,7 +65,7 @@ public class FoodMetaData { + if (this.foodTickTimer >= 80) { + // CraftBukkit - added RegainReason + entityhuman.heal(1.0F, org.bukkit.event.entity.EntityRegainHealthEvent.RegainReason.SATIATED); +- this.a(3.0F); ++ this.a(entityhuman.world.spigotConfig.regenExhaustion); // Spigot - Change to use configurable value + this.foodTickTimer = 0; + } + } else if (this.foodLevel <= 0) { +diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java +index fd79b25..3500931 100644 +--- a/src/main/java/org/spigotmc/SpigotWorldConfig.java ++++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java +@@ -326,4 +326,16 @@ public class SpigotWorldConfig + largeFeatureSeed = getInt( "seed-feature", 14357617 ); + log( "Custom Map Seeds: Village: " + villageSeed + " Feature: " + largeFeatureSeed ); + } ++ ++ public float walkExhaustion; ++ public float sprintExhaustion; ++ public float combatExhaustion; ++ public float regenExhaustion; ++ private void initHunger() ++ { ++ walkExhaustion = (float) getDouble( "hunger.walk-exhaustion", 0.2 ); ++ sprintExhaustion = (float) getDouble( "hunger.sprint-exhaustion", 0.8 ); ++ combatExhaustion = (float) getDouble( "hunger.combat-exhaustion", 0.3 ); ++ regenExhaustion = (float) getDouble( "hunger.regen-exhaustion", 3 ); ++ } + } +-- +1.9.1 + diff --git a/CraftBukkit-Patches/0176-Make-debug-logging-togglable.patch b/CraftBukkit-Patches/0176-Make-debug-logging-togglable.patch new file mode 100644 index 0000000000..d58a20fb3a --- /dev/null +++ b/CraftBukkit-Patches/0176-Make-debug-logging-togglable.patch @@ -0,0 +1,67 @@ +From eb3b3f16aa7769e44c2394e78f650a860fcb364f Mon Sep 17 00:00:00 2001 +From: Minecrell +Date: Sun, 17 Aug 2014 12:42:53 +0200 +Subject: [PATCH] Make debug logging togglable. + + +diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java +index 9d2dfe9..fdc64d3 100644 +--- a/src/main/java/org/spigotmc/SpigotConfig.java ++++ b/src/main/java/org/spigotmc/SpigotConfig.java +@@ -18,6 +18,9 @@ import net.minecraft.server.AttributeRanged; + import net.minecraft.server.GenericAttributes; + import net.minecraft.util.gnu.trove.map.hash.TObjectIntHashMap; + import net.minecraft.server.MinecraftServer; ++import org.apache.logging.log4j.LogManager; ++import org.apache.logging.log4j.core.LoggerContext; ++import org.apache.logging.log4j.core.config.Configuration; + import org.bukkit.Bukkit; + import org.bukkit.ChatColor; + import org.bukkit.command.Command; +@@ -371,4 +374,27 @@ public class SpigotConfig + URL.setURLStreamHandlerFactory(new CachedStreamHandlerFactory()); + } + } ++ ++ public static boolean debug; ++ private static void debug() ++ { ++ debug = getBoolean( "settings.debug", false ); ++ ++ if ( debug && !LogManager.getRootLogger().isTraceEnabled() ) ++ { ++ // Enable debug logging ++ LoggerContext ctx = (LoggerContext) LogManager.getContext( false ); ++ Configuration conf = ctx.getConfiguration(); ++ conf.getLoggerConfig( LogManager.ROOT_LOGGER_NAME ).setLevel( org.apache.logging.log4j.Level.ALL ); ++ ctx.updateLoggers( conf ); ++ } ++ ++ if ( LogManager.getRootLogger().isTraceEnabled() ) ++ { ++ Bukkit.getLogger().info( "Debug logging is enabled" ); ++ } else ++ { ++ Bukkit.getLogger().info( "Debug logging is disabled" ); ++ } ++ } + } +diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml +index e2209b8..65c09a8 100644 +--- a/src/main/resources/log4j2.xml ++++ b/src/main/resources/log4j2.xml +@@ -18,9 +18,9 @@ + + + +- ++ + +- ++ + + + +-- +1.9.1 + diff --git a/Spigot-Server-Patches/0022-Player-Exhaustion-Multipliers.patch b/Spigot-Server-Patches/0022-Player-Exhaustion-Multipliers.patch index bb1e97cb70..8f4271a606 100644 --- a/Spigot-Server-Patches/0022-Player-Exhaustion-Multipliers.patch +++ b/Spigot-Server-Patches/0022-Player-Exhaustion-Multipliers.patch @@ -1,11 +1,11 @@ -From 9471d677129b9aebaa0045bb39f128ace1769b46 Mon Sep 17 00:00:00 2001 +From b602c24185643022a5ccdb755ebd3667b467d1ec Mon Sep 17 00:00:00 2001 From: gsand -Date: Tue, 5 Aug 2014 18:28:21 -0500 +Date: Sun, 17 Aug 2014 16:40:54 -0500 Subject: [PATCH] Player Exhaustion Multipliers diff --git a/src/main/java/net/minecraft/server/Block.java b/src/main/java/net/minecraft/server/Block.java -index 0893a6f..acb9c54 100644 +index 0893a6f..24e84d6 100644 --- a/src/main/java/net/minecraft/server/Block.java +++ b/src/main/java/net/minecraft/server/Block.java @@ -686,7 +686,7 @@ public class Block { @@ -13,103 +13,45 @@ index 0893a6f..acb9c54 100644 public void a(World world, EntityHuman entityhuman, int i, int j, int k, int l) { entityhuman.a(StatisticList.MINE_BLOCK_COUNT[getId(this)], 1); - entityhuman.applyExhaustion(0.025F); -+ entityhuman.applyExhaustion(org.github.paperspigot.PaperSpigotConfig.playerExhaustionBlockBreak); // PaperSpigot - Configurable block breaking exhaustion ++ entityhuman.applyExhaustion(world.paperSpigotConfig.blockBreakExhaustion); // PaperSpigot - Configurable block break exhaustion if (this.E() && EnchantmentManager.hasSilkTouchEnchantment(entityhuman)) { ItemStack itemstack = this.j(l); diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java -index c0355bc..08987f2 100644 +index 0054f18..22776ad 100644 --- a/src/main/java/net/minecraft/server/EntityHuman.java +++ b/src/main/java/net/minecraft/server/EntityHuman.java -@@ -1006,7 +1006,7 @@ public abstract class EntityHuman extends EntityLiving implements ICommandListen - } - } - -- this.applyExhaustion(0.3F); -+ this.applyExhaustion(org.github.paperspigot.PaperSpigotConfig.playerExhaustionAttack); // PaperSpigot - Configurable attack exhaustion - } else if (flag1) { - entity.extinguish(); - } -@@ -1266,9 +1266,9 @@ public abstract class EntityHuman extends EntityLiving implements ICommandListen - super.bj(); - this.a(StatisticList.r, 1); - if (this.isSprinting()) { -- this.applyExhaustion(0.8F); -+ this.applyExhaustion(org.github.paperspigot.PaperSpigotConfig.playerExhaustionSprintJumping); // PaperSpigot - Configurable sprint jumping exhaustion - } else { -- this.applyExhaustion(0.2F); -+ this.applyExhaustion(org.github.paperspigot.PaperSpigotConfig.playerExhaustionJumping); // PaperSpigot - Configurable jumping exhaustion - } - } - @@ -1304,13 +1304,13 @@ public abstract class EntityHuman extends EntityLiving implements ICommandListen i = Math.round(MathHelper.sqrt(d0 * d0 + d1 * d1 + d2 * d2) * 100.0F); if (i > 0) { this.a(StatisticList.m, i); - this.applyExhaustion(0.015F * (float) i * 0.01F); -+ this.applyExhaustion(org.github.paperspigot.PaperSpigotConfig.playerExhaustionSwimming * (float) i * 0.01F); // PaperSpigot - Configurable swimming exhaustion ++ this.applyExhaustion(world.paperSpigotConfig.playerSwimmingExhaustion * (float) i * 0.01F); // PaperSpigot - Configurable swimming exhaustion } } else if (this.M()) { i = Math.round(MathHelper.sqrt(d0 * d0 + d2 * d2) * 100.0F); if (i > 0) { this.a(StatisticList.i, i); - this.applyExhaustion(0.015F * (float) i * 0.01F); -+ this.applyExhaustion(org.github.paperspigot.PaperSpigotConfig.playerExhaustionSwimming * (float) i * 0.01F); // PaperSpigot - Configurable swimming (diving) exhaustion ++ this.applyExhaustion(world.paperSpigotConfig.playerSwimmingExhaustion * (float) i * 0.01F); // PaperSpigot - Configurable swimming (diving) exhaustion } } else if (this.h_()) { if (d1 > 0.0D) { -@@ -1321,9 +1321,9 @@ public abstract class EntityHuman extends EntityLiving implements ICommandListen - if (i > 0) { - this.a(StatisticList.h, i); - if (this.isSprinting()) { -- this.applyExhaustion(0.099999994F * (float) i * 0.01F); -+ this.applyExhaustion(org.github.paperspigot.PaperSpigotConfig.playerExhaustionSprinting * (float) i * 0.01F); // PaperSpigot - Configurable sprinting exhaustion - } else { -- this.applyExhaustion(0.01F * (float) i * 0.01F); -+ this.applyExhaustion(org.github.paperspigot.PaperSpigotConfig.playerExhaustionWalking * (float) i * 0.01F); // PaperSpigot - Configurable walking exhaustion - } - } - } else { -diff --git a/src/main/java/net/minecraft/server/FoodMetaData.java b/src/main/java/net/minecraft/server/FoodMetaData.java -index 4169231..0189c99 100644 ---- a/src/main/java/net/minecraft/server/FoodMetaData.java -+++ b/src/main/java/net/minecraft/server/FoodMetaData.java -@@ -65,7 +65,7 @@ public class FoodMetaData { - if (this.foodTickTimer >= 80) { - // CraftBukkit - added RegainReason - entityhuman.heal(1.0F, org.bukkit.event.entity.EntityRegainHealthEvent.RegainReason.SATIATED); -- this.a(3.0F); -+ this.a(org.github.paperspigot.PaperSpigotConfig.playerExhaustionRegeneration); // PaperSpigot - Configurable regeneration exhaustion - this.foodTickTimer = 0; - } - } else if (this.foodLevel <= 0) { -diff --git a/src/main/java/org/github/paperspigot/PaperSpigotConfig.java b/src/main/java/org/github/paperspigot/PaperSpigotConfig.java -index 25a94a6..89bb1ca 100644 ---- a/src/main/java/org/github/paperspigot/PaperSpigotConfig.java -+++ b/src/main/java/org/github/paperspigot/PaperSpigotConfig.java -@@ -161,4 +161,24 @@ public class PaperSpigotConfig - Bukkit.getLogger().log( Level.INFO, "Disabling player interaction limiter, your server may be more vulnerable to malicious users" ); - } +diff --git a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java +index 1d01f89..df84df5 100644 +--- a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java ++++ b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java +@@ -121,4 +121,12 @@ public class PaperSpigotWorldConfig + fishingMinTicks = getInt( "fishing-time-range.MinimumTicks", 100 ); + fishingMaxTicks = getInt( "fishing-time-range.MaximumTicks", 900 ); } + -+ public static float playerExhaustionWalking; -+ public static float playerExhaustionSwimming; -+ public static float playerExhaustionBlockBreak; -+ public static float playerExhaustionSprinting; -+ public static float playerExhaustionJumping; -+ public static float playerExhaustionSprintJumping; -+ public static float playerExhaustionAttack; -+ public static float playerExhaustionRegeneration; -+ private static void playerExhaustion() ++ public float blockBreakExhaustion; ++ public float playerSwimmingExhaustion; ++ private void exhaustionValues () + { -+ playerExhaustionWalking = getFloat( "player-exhaustion.walking", 0.01F ); -+ playerExhaustionSwimming = getFloat( "player-exhaustion.swimming", 0.015F ); -+ playerExhaustionBlockBreak = getFloat( "player-exhaustion.block-break", 0.025F ); -+ playerExhaustionSprinting = getFloat( "player-exhaustion.sprinting", 0.1F ); -+ playerExhaustionJumping = getFloat( "player-exhaustion.jumping", 0.2F ); -+ playerExhaustionSprintJumping = getFloat( "player-exhaustion.sprint-jumping", 0.8F ); -+ playerExhaustionAttack = getFloat( "player-exhaustion.attack", 0.3F ); -+ playerExhaustionRegeneration = getFloat( "player-exhaustion.regeneration", 3.0F ); ++ blockBreakExhaustion = getFloat( "player-exhaustion.block-break", 0.025F ); ++ playerSwimmingExhaustion = getFloat("player-exhaustion.swimming", 0.015F ); + } } -- diff --git a/Spigot-Server-Patches/0023-Add-configurable-despawn-distances-for-living-entiti.patch b/Spigot-Server-Patches/0023-Add-configurable-despawn-distances-for-living-entiti.patch index a3aaf463ce..ff532f4130 100644 --- a/Spigot-Server-Patches/0023-Add-configurable-despawn-distances-for-living-entiti.patch +++ b/Spigot-Server-Patches/0023-Add-configurable-despawn-distances-for-living-entiti.patch @@ -1,4 +1,4 @@ -From 4bd854bcda1d3f9666d2a908cc80c63afc3d002a Mon Sep 17 00:00:00 2001 +From f6eb14ae1bb9955b7f74c46cecb138c78b49cd3f Mon Sep 17 00:00:00 2001 From: Suddenly Date: Mon, 7 Jul 2014 04:11:34 +0100 Subject: [PATCH] Add configurable despawn distances for living entities @@ -26,12 +26,12 @@ index 2915f4a..d0f7033 100644 } } diff --git a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java -index 1d01f89..3d11da5 100644 +index df84df5..1e1a382 100644 --- a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java +++ b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java -@@ -121,4 +121,22 @@ public class PaperSpigotWorldConfig - fishingMinTicks = getInt( "fishing-time-range.MinimumTicks", 100 ); - fishingMaxTicks = getInt( "fishing-time-range.MaximumTicks", 900 ); +@@ -129,4 +129,22 @@ public class PaperSpigotWorldConfig + blockBreakExhaustion = getFloat( "player-exhaustion.block-break", 0.025F ); + playerSwimmingExhaustion = getFloat("player-exhaustion.swimming", 0.015F ); } + + public Integer softDespawnDistance; diff --git a/Spigot-Server-Patches/0024-Allow-for-toggling-of-spawn-chunks.patch b/Spigot-Server-Patches/0024-Allow-for-toggling-of-spawn-chunks.patch index 50b6d305cd..b76e67ef71 100644 --- a/Spigot-Server-Patches/0024-Allow-for-toggling-of-spawn-chunks.patch +++ b/Spigot-Server-Patches/0024-Allow-for-toggling-of-spawn-chunks.patch @@ -1,4 +1,4 @@ -From 8661e9266f9c8823257b23db91a75b7faba679ee Mon Sep 17 00:00:00 2001 +From 02810be39c90969e1bddb98ce902d19063d53171 Mon Sep 17 00:00:00 2001 From: Dmck2b Date: Thu, 10 Jul 2014 16:57:10 +0100 Subject: [PATCH] Allow for toggling of spawn chunks @@ -6,7 +6,7 @@ Subject: [PATCH] Allow for toggling of spawn chunks Now with 100% more confirmed working by creator diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index a204966..e82cb35 100644 +index 7281b59..0358c7c 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -222,6 +222,7 @@ public abstract class World implements IBlockAccess { @@ -18,10 +18,10 @@ index a204966..e82cb35 100644 this.chunkTickRadius = (byte) ( ( this.getServer().getViewDistance() < 7 ) ? this.getServer().getViewDistance() : 7 ); this.chunkTickList = new net.minecraft.util.gnu.trove.map.hash.TLongShortHashMap( spigotConfig.chunksPerTick * 5, 0.7f, Long.MIN_VALUE, Short.MIN_VALUE ); diff --git a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java -index e627c4e..39bbd62 100644 +index 1e1a382..ca977bc 100644 --- a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java +++ b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java -@@ -162,4 +162,11 @@ public class PaperSpigotWorldConfig +@@ -147,4 +147,11 @@ public class PaperSpigotWorldConfig softDespawnDistance = softDespawnDistance*softDespawnDistance; hardDespawnDistance = hardDespawnDistance*hardDespawnDistance; } diff --git a/Spigot-Server-Patches/0027-Drop-falling-block-entities-that-are-above-the-speci.patch b/Spigot-Server-Patches/0027-Drop-falling-block-entities-that-are-above-the-speci.patch index 1e3415e7cf..21d9e5e8fd 100644 --- a/Spigot-Server-Patches/0027-Drop-falling-block-entities-that-are-above-the-speci.patch +++ b/Spigot-Server-Patches/0027-Drop-falling-block-entities-that-are-above-the-speci.patch @@ -1,4 +1,4 @@ -From 2c20bd30ddb002e0f17abbce55b0ccf99fb659c2 Mon Sep 17 00:00:00 2001 +From 282c195a7be0f610136d9d068558399d6a4df4ab Mon Sep 17 00:00:00 2001 From: Byteflux Date: Tue, 5 Aug 2014 18:39:57 -0500 Subject: [PATCH] Drop falling block entities that are above the specified @@ -27,10 +27,10 @@ index df602bd..00dcca6 100644 this.motY *= 0.9800000190734863D; this.motZ *= 0.9800000190734863D; diff --git a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java -index f998cb0..fc9b6df 100644 +index ca977bc..708318d 100644 --- a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java +++ b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java -@@ -146,4 +146,14 @@ public class PaperSpigotWorldConfig +@@ -154,4 +154,14 @@ public class PaperSpigotWorldConfig keepSpawnInMemory = getBoolean( "keep-spawn-loaded", true ); log( "Keep spawn chunk loaded: " + keepSpawnInMemory ); } diff --git a/Spigot-Server-Patches/0029-Configurable-speed-for-water-flowing-over-lava.patch b/Spigot-Server-Patches/0028-Configurable-speed-for-water-flowing-over-lava.patch similarity index 94% rename from Spigot-Server-Patches/0029-Configurable-speed-for-water-flowing-over-lava.patch rename to Spigot-Server-Patches/0028-Configurable-speed-for-water-flowing-over-lava.patch index 3d48435852..493d80b80c 100644 --- a/Spigot-Server-Patches/0029-Configurable-speed-for-water-flowing-over-lava.patch +++ b/Spigot-Server-Patches/0028-Configurable-speed-for-water-flowing-over-lava.patch @@ -1,4 +1,4 @@ -From 0bb791d470c5d4067198a353c2f0aab3168ff20f Mon Sep 17 00:00:00 2001 +From 0fca3bbe6aed83859a5b107f58c74ee936f5736f Mon Sep 17 00:00:00 2001 From: Byteflux Date: Sun, 3 Aug 2014 21:20:42 -0500 Subject: [PATCH] Configurable speed for water flowing over lava @@ -46,10 +46,10 @@ index cdce3ff..6409391 100644 + } } diff --git a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java -index fc9b6df..256316e 100644 +index 708318d..ce3fb73 100644 --- a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java +++ b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java -@@ -156,4 +156,11 @@ public class PaperSpigotWorldConfig +@@ -164,4 +164,11 @@ public class PaperSpigotWorldConfig log( "TNT/Falling Block Height Limit set to Y: " + fallingBlockHeightNerf); } } diff --git a/Spigot-Server-Patches/0028-Don-t-log-debug-information.patch b/Spigot-Server-Patches/0028-Don-t-log-debug-information.patch deleted file mode 100644 index e76074147b..0000000000 --- a/Spigot-Server-Patches/0028-Don-t-log-debug-information.patch +++ /dev/null @@ -1,33 +0,0 @@ -From dae0d90aa3e356673e9f24e46517e3631aff4974 Mon Sep 17 00:00:00 2001 -From: Dmck2b -Date: Mon, 4 Aug 2014 02:56:23 +0100 -Subject: [PATCH] Don't log debug information - - -diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml -index adc0181..468dfea 100644 ---- a/src/main/resources/log4j2.xml -+++ b/src/main/resources/log4j2.xml -@@ -14,14 +14,13 @@ - - - -- -+ - - - -- -+ - -- -+ - - -- -- -+ -\ No newline at end of file --- -1.8.4.msysgit.0 - diff --git a/Spigot-Server-Patches/0030-Center-TNT-grid-sample-points.patch b/Spigot-Server-Patches/0029-Center-TNT-grid-sample-points.patch similarity index 96% rename from Spigot-Server-Patches/0030-Center-TNT-grid-sample-points.patch rename to Spigot-Server-Patches/0029-Center-TNT-grid-sample-points.patch index 347c038a4c..48ff483d1e 100644 --- a/Spigot-Server-Patches/0030-Center-TNT-grid-sample-points.patch +++ b/Spigot-Server-Patches/0029-Center-TNT-grid-sample-points.patch @@ -1,4 +1,4 @@ -From 3ed41430e90a11705a2d857d72f052b83fb79d0e Mon Sep 17 00:00:00 2001 +From 8260d6efa8936d75822c4b324ecae9e4ac299033 Mon Sep 17 00:00:00 2001 From: Jedediah Smith Date: Wed, 6 Aug 2014 18:17:41 -0500 Subject: [PATCH] Center TNT grid sample points diff --git a/Spigot-Server-Patches/0031-Player-affects-spawning-API.patch b/Spigot-Server-Patches/0030-Player-affects-spawning-API.patch similarity index 98% rename from Spigot-Server-Patches/0031-Player-affects-spawning-API.patch rename to Spigot-Server-Patches/0030-Player-affects-spawning-API.patch index 8b63c42d87..c5dde5255c 100644 --- a/Spigot-Server-Patches/0031-Player-affects-spawning-API.patch +++ b/Spigot-Server-Patches/0030-Player-affects-spawning-API.patch @@ -1,11 +1,11 @@ -From 7829ffe30ea4dc9b409cd5140140b84a3372cc27 Mon Sep 17 00:00:00 2001 +From 10bf5e90254667d8ead33152b4ae4842d31d88fc Mon Sep 17 00:00:00 2001 From: Jedediah Smith Date: Fri, 8 Aug 2014 22:51:26 -0500 Subject: [PATCH] Player affects spawning API diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java -index 08987f2..649e0d3 100644 +index 22776ad..67745b1 100644 --- a/src/main/java/net/minecraft/server/EntityHuman.java +++ b/src/main/java/net/minecraft/server/EntityHuman.java @@ -41,6 +41,7 @@ public abstract class EntityHuman extends EntityLiving implements ICommandListen diff --git a/Spigot-Server-Patches/0032-Configurable-hanging-tick.patch b/Spigot-Server-Patches/0031-Configurable-hanging-tick.patch similarity index 91% rename from Spigot-Server-Patches/0032-Configurable-hanging-tick.patch rename to Spigot-Server-Patches/0031-Configurable-hanging-tick.patch index ad132f0c7b..cda76fa0a3 100644 --- a/Spigot-Server-Patches/0032-Configurable-hanging-tick.patch +++ b/Spigot-Server-Patches/0031-Configurable-hanging-tick.patch @@ -1,4 +1,4 @@ -From ee7f178f022584989b8dd9d27b456e8d832ae0ca Mon Sep 17 00:00:00 2001 +From b376680ab8cd0bd29566e11b7879db8b6cc83fed Mon Sep 17 00:00:00 2001 From: drXor Date: Sat, 9 Aug 2014 17:24:20 -0500 Subject: [PATCH] Configurable hanging tick @@ -18,10 +18,10 @@ index eec465b..3b6d152 100644 if (!this.dead && !this.survives()) { // CraftBukkit start - fire break events diff --git a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java -index 256316e..16eb1ca 100644 +index ce3fb73..552a53c 100644 --- a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java +++ b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java -@@ -163,4 +163,11 @@ public class PaperSpigotWorldConfig +@@ -171,4 +171,11 @@ public class PaperSpigotWorldConfig waterOverLavaFlowSpeed = getInt( "water-over-lava-flow-speed", 5 ); log( "Water over lava flow speed: " + waterOverLavaFlowSpeed); } diff --git a/Spigot-Server-Patches/0033-Don-t-tick-chests.patch b/Spigot-Server-Patches/0032-Don-t-tick-chests.patch similarity index 97% rename from Spigot-Server-Patches/0033-Don-t-tick-chests.patch rename to Spigot-Server-Patches/0032-Don-t-tick-chests.patch index cb04c051f7..4ce0d40323 100644 --- a/Spigot-Server-Patches/0033-Don-t-tick-chests.patch +++ b/Spigot-Server-Patches/0032-Don-t-tick-chests.patch @@ -1,4 +1,4 @@ -From 80de92273b24ee6372910c4041c13147ac411a56 Mon Sep 17 00:00:00 2001 +From 6331ec0f4754f0bf76c11e52a3d1ca1dac0925df Mon Sep 17 00:00:00 2001 From: Iceee Date: Fri, 11 Jul 2014 01:31:43 -0500 Subject: [PATCH] Don't tick chests