From 04b7baf7582184adcc37f943c81bf58e6d9bdebc Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sun, 6 Jul 2014 02:47:46 -0500 Subject: [PATCH] Remove patch 0012 hunger mulitplier for sprint jump Newer and better patch coming soon cc @gsand --- ...ger-multiplier-for-player-sprint-jum.patch | 37 ------------------- ...2-Inverted-Daylight-Detector-Toggle.patch} | 12 +++--- ...-Add-1.8-recipes-for-stone-variants.patch} | 2 +- ...014-Ability-to-disable-asynccatcher.patch} | 4 +- ...tch => 0015-Fix-redstone-lag-issues.patch} | 2 +- ...o-not-remove-player-in-world-change.patch} | 2 +- ...h => 0017-Actually-fix-TNT-movement.patch} | 2 +- ...ie-sieges-and-their-spawn-mechanics.patch} | 2 +- ...19-Configurable-fishing-time-ranges.patch} | 6 +-- ...h => 0020-Allow-nerfed-mobs-to-jump.patch} | 2 +- ...rable-interaction-limit-restriction.patch} | 2 +- ...e-information-to-some-world-crashes.patch} | 4 +- ...rrors-more-friendly-and-less-crashy.patch} | 6 +-- ...main-tick-loop-feature-configurable.patch} | 2 +- 14 files changed, 24 insertions(+), 61 deletions(-) delete mode 100644 CraftBukkit-Patches/0012-Configurable-hunger-multiplier-for-player-sprint-jum.patch rename CraftBukkit-Patches/{0013-Inverted-Daylight-Detector-Toggle.patch => 0012-Inverted-Daylight-Detector-Toggle.patch} (87%) rename CraftBukkit-Patches/{0014-Add-1.8-recipes-for-stone-variants.patch => 0013-Add-1.8-recipes-for-stone-variants.patch} (97%) rename CraftBukkit-Patches/{0015-Ability-to-disable-asynccatcher.patch => 0014-Ability-to-disable-asynccatcher.patch} (94%) rename CraftBukkit-Patches/{0016-Fix-redstone-lag-issues.patch => 0015-Fix-redstone-lag-issues.patch} (94%) rename CraftBukkit-Patches/{0017-Do-not-remove-player-in-world-change.patch => 0016-Do-not-remove-player-in-world-change.patch} (96%) rename CraftBukkit-Patches/{0018-Actually-fix-TNT-movement.patch => 0017-Actually-fix-TNT-movement.patch} (95%) rename CraftBukkit-Patches/{0019-Fix-zombie-sieges-and-their-spawn-mechanics.patch => 0018-Fix-zombie-sieges-and-their-spawn-mechanics.patch} (96%) rename CraftBukkit-Patches/{0020-Configurable-fishing-time-ranges.patch => 0019-Configurable-fishing-time-ranges.patch} (95%) rename CraftBukkit-Patches/{0021-Allow-nerfed-mobs-to-jump.patch => 0020-Allow-nerfed-mobs-to-jump.patch} (93%) rename CraftBukkit-Patches/{0022-Configurable-interaction-limit-restriction.patch => 0021-Configurable-interaction-limit-restriction.patch} (96%) rename CraftBukkit-Patches/{0023-Add-more-information-to-some-world-crashes.patch => 0022-Add-more-information-to-some-world-crashes.patch} (95%) rename CraftBukkit-Patches/{0024-Make-JSON-errors-more-friendly-and-less-crashy.patch => 0023-Make-JSON-errors-more-friendly-and-less-crashy.patch} (96%) rename CraftBukkit-Patches/{0025-Make-players-in-main-tick-loop-feature-configurable.patch => 0024-Make-players-in-main-tick-loop-feature-configurable.patch} (99%) diff --git a/CraftBukkit-Patches/0012-Configurable-hunger-multiplier-for-player-sprint-jum.patch b/CraftBukkit-Patches/0012-Configurable-hunger-multiplier-for-player-sprint-jum.patch deleted file mode 100644 index 8be0b12396..0000000000 --- a/CraftBukkit-Patches/0012-Configurable-hunger-multiplier-for-player-sprint-jum.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 30265e6a9f36221e235337b9a8c0217761a9c379 Mon Sep 17 00:00:00 2001 -From: gsand -Date: Tue, 15 Apr 2014 18:00:02 -0700 -Subject: [PATCH] Configurable hunger multiplier for player sprint jumping - - -diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java -index eb123ff..296bb2d 100644 ---- a/src/main/java/net/minecraft/server/EntityHuman.java -+++ b/src/main/java/net/minecraft/server/EntityHuman.java -@@ -1256,7 +1256,7 @@ public abstract class EntityHuman extends EntityLiving implements ICommandListen - super.bi(); - this.a(StatisticList.r, 1); - if (this.isSprinting()) { -- this.a(0.8F); -+ this.a(PaperSpigotWorldConfig.playerSprintJumpingHungerMultiplier); // PaperSpigot - Configurable hunger multiplier for player sprint jumping - } else { - this.a(0.2F); - } -diff --git a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java -index 014aee3..28181f2 100644 ---- a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java -+++ b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java -@@ -110,4 +110,10 @@ public class PaperSpigotWorldConfig - { - babyZombieMovementSpeed = getDouble( "baby-zombie-movement-speed", 0.5D ); - } -+ -+ public static float playerSprintJumpingHungerMultiplier; -+ private void playerSprintJumpingHungerMultiplier() -+ { -+ playerSprintJumpingHungerMultiplier = getFloat( "player-sprint-jumping-hunger-multiplier", 0.8F ); -+ } - } --- -1.9.1 - diff --git a/CraftBukkit-Patches/0013-Inverted-Daylight-Detector-Toggle.patch b/CraftBukkit-Patches/0012-Inverted-Daylight-Detector-Toggle.patch similarity index 87% rename from CraftBukkit-Patches/0013-Inverted-Daylight-Detector-Toggle.patch rename to CraftBukkit-Patches/0012-Inverted-Daylight-Detector-Toggle.patch index 32502ab732..fcdd453791 100644 --- a/CraftBukkit-Patches/0013-Inverted-Daylight-Detector-Toggle.patch +++ b/CraftBukkit-Patches/0012-Inverted-Daylight-Detector-Toggle.patch @@ -1,6 +1,6 @@ -From 0ccf48e94c8a61875c2277840204509f95e65e02 Mon Sep 17 00:00:00 2001 -From: gsand -Date: Tue, 24 Jun 2014 08:01:42 -0500 +From cb94917c459a2c94181d931cefcf62cd4cbc0ce5 Mon Sep 17 00:00:00 2001 +From: Zach Brown +Date: Sun, 6 Jul 2014 02:46:20 -0500 Subject: [PATCH] Inverted Daylight Detector Toggle @@ -51,12 +51,12 @@ index 96e9c37..dc84635 100644 if (l != i1) { i1 = org.bukkit.craftbukkit.event.CraftEventFactory.callRedstoneChange(world, i, j, k, l, i1).getNewCurrent(); // CraftBukkit - Call BlockRedstoneEvent diff --git a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java -index f761c96..a05d5a4 100644 +index 29863cd..c219cab 100644 --- a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java +++ b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java -@@ -115,4 +115,11 @@ public class PaperSpigotWorldConfig +@@ -109,4 +109,11 @@ public class PaperSpigotWorldConfig { - playerSprintJumpingHungerMultiplier = getFloat( "player-sprint-jumping-hunger-multiplier", 0.8F ); + babyZombieMovementSpeed = getDouble( "baby-zombie-movement-speed", 0.5D ); } + + public static boolean InvertedDaylightDetectors; diff --git a/CraftBukkit-Patches/0014-Add-1.8-recipes-for-stone-variants.patch b/CraftBukkit-Patches/0013-Add-1.8-recipes-for-stone-variants.patch similarity index 97% rename from CraftBukkit-Patches/0014-Add-1.8-recipes-for-stone-variants.patch rename to CraftBukkit-Patches/0013-Add-1.8-recipes-for-stone-variants.patch index 1125e79f8c..496420ddd6 100644 --- a/CraftBukkit-Patches/0014-Add-1.8-recipes-for-stone-variants.patch +++ b/CraftBukkit-Patches/0013-Add-1.8-recipes-for-stone-variants.patch @@ -1,4 +1,4 @@ -From 149f4e22b7778e9b7de66813968a33f7fd45b4df Mon Sep 17 00:00:00 2001 +From dc1e612cabecd5b17f67e25ae052cd114283e054 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Tue, 10 Jun 2014 18:22:19 -0500 Subject: [PATCH] Add 1.8 recipes for stone variants diff --git a/CraftBukkit-Patches/0015-Ability-to-disable-asynccatcher.patch b/CraftBukkit-Patches/0014-Ability-to-disable-asynccatcher.patch similarity index 94% rename from CraftBukkit-Patches/0015-Ability-to-disable-asynccatcher.patch rename to CraftBukkit-Patches/0014-Ability-to-disable-asynccatcher.patch index c553c3bf22..34aa8e81df 100644 --- a/CraftBukkit-Patches/0015-Ability-to-disable-asynccatcher.patch +++ b/CraftBukkit-Patches/0014-Ability-to-disable-asynccatcher.patch @@ -1,11 +1,11 @@ -From be690aa73e8c1d647493a5ff8b52005009bb5ee6 Mon Sep 17 00:00:00 2001 +From bd1bd2ff1f6e2b5c5b9c1ca921c641e41497e518 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Wed, 2 Jul 2014 22:34:04 -0500 Subject: [PATCH] Ability to disable asynccatcher diff --git a/src/main/java/org/github/paperspigot/PaperSpigotConfig.java b/src/main/java/org/github/paperspigot/PaperSpigotConfig.java -index 5d309da..5cb3f91 100644 +index 5d309da..3131c30 100644 --- a/src/main/java/org/github/paperspigot/PaperSpigotConfig.java +++ b/src/main/java/org/github/paperspigot/PaperSpigotConfig.java @@ -120,4 +120,13 @@ public class PaperSpigotConfig diff --git a/CraftBukkit-Patches/0016-Fix-redstone-lag-issues.patch b/CraftBukkit-Patches/0015-Fix-redstone-lag-issues.patch similarity index 94% rename from CraftBukkit-Patches/0016-Fix-redstone-lag-issues.patch rename to CraftBukkit-Patches/0015-Fix-redstone-lag-issues.patch index 50cf46d593..2176a45fd2 100644 --- a/CraftBukkit-Patches/0016-Fix-redstone-lag-issues.patch +++ b/CraftBukkit-Patches/0015-Fix-redstone-lag-issues.patch @@ -1,4 +1,4 @@ -From eecbef5691460565f960096f86e8c4c3274cc841 Mon Sep 17 00:00:00 2001 +From 73f5bcdfc505cbe22effd9eb8730ad348eb77e67 Mon Sep 17 00:00:00 2001 From: Iceee Date: Thu, 12 Jun 2014 13:37:35 -0500 Subject: [PATCH] Fix redstone lag issues diff --git a/CraftBukkit-Patches/0017-Do-not-remove-player-in-world-change.patch b/CraftBukkit-Patches/0016-Do-not-remove-player-in-world-change.patch similarity index 96% rename from CraftBukkit-Patches/0017-Do-not-remove-player-in-world-change.patch rename to CraftBukkit-Patches/0016-Do-not-remove-player-in-world-change.patch index 2a9a65a282..5510e47a56 100644 --- a/CraftBukkit-Patches/0017-Do-not-remove-player-in-world-change.patch +++ b/CraftBukkit-Patches/0016-Do-not-remove-player-in-world-change.patch @@ -1,4 +1,4 @@ -From 09f43d297f1e89124a97532b0c02750b0f154fe9 Mon Sep 17 00:00:00 2001 +From ac7c65470448906bdc983a919edf2280c1528e12 Mon Sep 17 00:00:00 2001 From: T00thpick1 Date: Mon, 23 Jun 2014 21:37:24 -0500 Subject: [PATCH] Do not remove player in world change diff --git a/CraftBukkit-Patches/0018-Actually-fix-TNT-movement.patch b/CraftBukkit-Patches/0017-Actually-fix-TNT-movement.patch similarity index 95% rename from CraftBukkit-Patches/0018-Actually-fix-TNT-movement.patch rename to CraftBukkit-Patches/0017-Actually-fix-TNT-movement.patch index 4b66a34495..2a2d092f7d 100644 --- a/CraftBukkit-Patches/0018-Actually-fix-TNT-movement.patch +++ b/CraftBukkit-Patches/0017-Actually-fix-TNT-movement.patch @@ -1,4 +1,4 @@ -From e5b5b1c567121fc928252436476aad3485adf72a Mon Sep 17 00:00:00 2001 +From cd40518ae7eabae3633be74ed13f491158884586 Mon Sep 17 00:00:00 2001 From: Iceee Date: Tue, 24 Jun 2014 00:03:34 -0500 Subject: [PATCH] Actually fix TNT movement diff --git a/CraftBukkit-Patches/0019-Fix-zombie-sieges-and-their-spawn-mechanics.patch b/CraftBukkit-Patches/0018-Fix-zombie-sieges-and-their-spawn-mechanics.patch similarity index 96% rename from CraftBukkit-Patches/0019-Fix-zombie-sieges-and-their-spawn-mechanics.patch rename to CraftBukkit-Patches/0018-Fix-zombie-sieges-and-their-spawn-mechanics.patch index 577a2dc7b6..76e8abe0f3 100644 --- a/CraftBukkit-Patches/0019-Fix-zombie-sieges-and-their-spawn-mechanics.patch +++ b/CraftBukkit-Patches/0018-Fix-zombie-sieges-and-their-spawn-mechanics.patch @@ -1,4 +1,4 @@ -From e0d7c57b76f4d4b2ad1d14a316ef77314c8446a6 Mon Sep 17 00:00:00 2001 +From 1e594bb5023efa579f537705e072494d608fa4a0 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Tue, 24 Jun 2014 22:55:30 -0500 Subject: [PATCH] Fix zombie sieges and their spawn mechanics diff --git a/CraftBukkit-Patches/0020-Configurable-fishing-time-ranges.patch b/CraftBukkit-Patches/0019-Configurable-fishing-time-ranges.patch similarity index 95% rename from CraftBukkit-Patches/0020-Configurable-fishing-time-ranges.patch rename to CraftBukkit-Patches/0019-Configurable-fishing-time-ranges.patch index b513e400f2..7ae1f63668 100644 --- a/CraftBukkit-Patches/0020-Configurable-fishing-time-ranges.patch +++ b/CraftBukkit-Patches/0019-Configurable-fishing-time-ranges.patch @@ -1,4 +1,4 @@ -From 40baf8c57ef779e199e0e88dbb51b3ddbcaf0f4e Mon Sep 17 00:00:00 2001 +From 5733313aae452f28afd6ae57cc1f44e88c93a700 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sun, 29 Jun 2014 13:22:09 -0500 Subject: [PATCH] Configurable fishing time ranges @@ -27,10 +27,10 @@ index 0763dd1..acabaf6 100644 } } diff --git a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java -index a05d5a4..154498d 100644 +index c219cab..554e74a 100644 --- a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java +++ b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java -@@ -122,4 +122,12 @@ public class PaperSpigotWorldConfig +@@ -116,4 +116,12 @@ public class PaperSpigotWorldConfig InvertedDaylightDetectors = getBoolean( "inverted-daylight-detectors", false ); log( "Inverted Redstone Lamps: " + InvertedDaylightDetectors ); } diff --git a/CraftBukkit-Patches/0021-Allow-nerfed-mobs-to-jump.patch b/CraftBukkit-Patches/0020-Allow-nerfed-mobs-to-jump.patch similarity index 93% rename from CraftBukkit-Patches/0021-Allow-nerfed-mobs-to-jump.patch rename to CraftBukkit-Patches/0020-Allow-nerfed-mobs-to-jump.patch index 9e8a3913c4..c969de86b4 100644 --- a/CraftBukkit-Patches/0021-Allow-nerfed-mobs-to-jump.patch +++ b/CraftBukkit-Patches/0020-Allow-nerfed-mobs-to-jump.patch @@ -1,4 +1,4 @@ -From 42ff8788e354f0f839e704a9aa6ba9c056ad3965 Mon Sep 17 00:00:00 2001 +From 9df86766b4f697aa783f938dd34fd789a525436e Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sun, 29 Jun 2014 13:32:36 -0500 Subject: [PATCH] Allow nerfed mobs to jump diff --git a/CraftBukkit-Patches/0022-Configurable-interaction-limit-restriction.patch b/CraftBukkit-Patches/0021-Configurable-interaction-limit-restriction.patch similarity index 96% rename from CraftBukkit-Patches/0022-Configurable-interaction-limit-restriction.patch rename to CraftBukkit-Patches/0021-Configurable-interaction-limit-restriction.patch index 23ae5d0000..03199cd9db 100644 --- a/CraftBukkit-Patches/0022-Configurable-interaction-limit-restriction.patch +++ b/CraftBukkit-Patches/0021-Configurable-interaction-limit-restriction.patch @@ -1,4 +1,4 @@ -From 93a0fc4b68a3803e2206b098f81b7d183c1e4e44 Mon Sep 17 00:00:00 2001 +From 9c171f8c9366c35ca2933948c57965fa3a6bd0ed Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Thu, 3 Jul 2014 00:53:47 -0500 Subject: [PATCH] Configurable interaction limit restriction diff --git a/CraftBukkit-Patches/0023-Add-more-information-to-some-world-crashes.patch b/CraftBukkit-Patches/0022-Add-more-information-to-some-world-crashes.patch similarity index 95% rename from CraftBukkit-Patches/0023-Add-more-information-to-some-world-crashes.patch rename to CraftBukkit-Patches/0022-Add-more-information-to-some-world-crashes.patch index 226831cb5b..47f990e950 100644 --- a/CraftBukkit-Patches/0023-Add-more-information-to-some-world-crashes.patch +++ b/CraftBukkit-Patches/0022-Add-more-information-to-some-world-crashes.patch @@ -1,11 +1,11 @@ -From f29ac022766836e78146170928e60c288decd347 Mon Sep 17 00:00:00 2001 +From 5fe47440dabafd1961f4acca2a29881a87699567 Mon Sep 17 00:00:00 2001 From: Suddenly Date: Sat, 5 Jul 2014 16:56:44 +0100 Subject: [PATCH] Add more information to some world crashes diff --git a/src/main/java/net/minecraft/server/WorldNBTStorage.java b/src/main/java/net/minecraft/server/WorldNBTStorage.java -index efdcad7..141248e 100644 +index efdcad7..907053d 100644 --- a/src/main/java/net/minecraft/server/WorldNBTStorage.java +++ b/src/main/java/net/minecraft/server/WorldNBTStorage.java @@ -54,7 +54,7 @@ public class WorldNBTStorage implements IDataManager, IPlayerFileData { diff --git a/CraftBukkit-Patches/0024-Make-JSON-errors-more-friendly-and-less-crashy.patch b/CraftBukkit-Patches/0023-Make-JSON-errors-more-friendly-and-less-crashy.patch similarity index 96% rename from CraftBukkit-Patches/0024-Make-JSON-errors-more-friendly-and-less-crashy.patch rename to CraftBukkit-Patches/0023-Make-JSON-errors-more-friendly-and-less-crashy.patch index 07e600ccf9..7fd4b7ea1e 100644 --- a/CraftBukkit-Patches/0024-Make-JSON-errors-more-friendly-and-less-crashy.patch +++ b/CraftBukkit-Patches/0023-Make-JSON-errors-more-friendly-and-less-crashy.patch @@ -1,11 +1,11 @@ -From 36dd238b869b47e8f0236bfe03ef60240ba9fdb9 Mon Sep 17 00:00:00 2001 +From 77bc2b87f2361bc3d936fd7041109ed71aa9a9a4 Mon Sep 17 00:00:00 2001 From: Suddenly Date: Mon, 16 Jun 2014 14:44:21 +0100 Subject: [PATCH] Make JSON errors more friendly and less crashy diff --git a/src/main/java/net/minecraft/server/JsonList.java b/src/main/java/net/minecraft/server/JsonList.java -index 36dbcf6..85c6dbc 100644 +index 36dbcf6..97ee120 100644 --- a/src/main/java/net/minecraft/server/JsonList.java +++ b/src/main/java/net/minecraft/server/JsonList.java @@ -9,6 +9,8 @@ import java.util.ArrayList; @@ -40,7 +40,7 @@ index 36dbcf6..85c6dbc 100644 IOUtils.closeQuietly(bufferedreader); } diff --git a/src/main/java/net/minecraft/server/UserCache.java b/src/main/java/net/minecraft/server/UserCache.java -index cc178c6..44ce9e2 100644 +index cc178c6..8729d03 100644 --- a/src/main/java/net/minecraft/server/UserCache.java +++ b/src/main/java/net/minecraft/server/UserCache.java @@ -27,6 +27,7 @@ import net.minecraft.util.com.google.gson.GsonBuilder; diff --git a/CraftBukkit-Patches/0025-Make-players-in-main-tick-loop-feature-configurable.patch b/CraftBukkit-Patches/0024-Make-players-in-main-tick-loop-feature-configurable.patch similarity index 99% rename from CraftBukkit-Patches/0025-Make-players-in-main-tick-loop-feature-configurable.patch rename to CraftBukkit-Patches/0024-Make-players-in-main-tick-loop-feature-configurable.patch index ce674fcce1..3740fe2217 100644 --- a/CraftBukkit-Patches/0025-Make-players-in-main-tick-loop-feature-configurable.patch +++ b/CraftBukkit-Patches/0024-Make-players-in-main-tick-loop-feature-configurable.patch @@ -1,4 +1,4 @@ -From b4ccfcda70b29d207685f5ca29f5f405d4f1ed6e Mon Sep 17 00:00:00 2001 +From 9c880888a208bb1909601ba0a5aeeb0205a97d0f Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sun, 6 Jul 2014 01:49:28 -0500 Subject: [PATCH] Make players in main tick loop feature configurable