From 1ee54478ddbe2d995e0d40369418ee649faad70b Mon Sep 17 00:00:00 2001 From: Zach Brown <1254957+zachbr@users.noreply.github.com> 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 | 35 ------------------- ...2-Inverted-Daylight-Detector-Toggle.patch} | 6 ++-- ...-Add-1.8-recipes-for-stone-variants.patch} | 0 ...014-Ability-to-disable-asynccatcher.patch} | 0 ...tch => 0015-Fix-redstone-lag-issues.patch} | 0 ...o-not-remove-player-in-world-change.patch} | 0 ...h => 0017-Actually-fix-TNT-movement.patch} | 0 ...ie-sieges-and-their-spawn-mechanics.patch} | 0 ...19-Configurable-fishing-time-ranges.patch} | 0 ...h => 0020-Allow-nerfed-mobs-to-jump.patch} | 0 ...rable-interaction-limit-restriction.patch} | 0 ...e-information-to-some-world-crashes.patch} | 0 ...rrors-more-friendly-and-less-crashy.patch} | 0 ...main-tick-loop-feature-configurable.patch} | 0 14 files changed, 3 insertions(+), 38 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} (93%) rename CraftBukkit-Patches/{0014-Add-1.8-recipes-for-stone-variants.patch => 0013-Add-1.8-recipes-for-stone-variants.patch} (100%) rename CraftBukkit-Patches/{0015-Ability-to-disable-asynccatcher.patch => 0014-Ability-to-disable-asynccatcher.patch} (100%) rename CraftBukkit-Patches/{0016-Fix-redstone-lag-issues.patch => 0015-Fix-redstone-lag-issues.patch} (100%) rename CraftBukkit-Patches/{0017-Do-not-remove-player-in-world-change.patch => 0016-Do-not-remove-player-in-world-change.patch} (100%) rename CraftBukkit-Patches/{0018-Actually-fix-TNT-movement.patch => 0017-Actually-fix-TNT-movement.patch} (100%) rename CraftBukkit-Patches/{0019-Fix-zombie-sieges-and-their-spawn-mechanics.patch => 0018-Fix-zombie-sieges-and-their-spawn-mechanics.patch} (100%) rename CraftBukkit-Patches/{0020-Configurable-fishing-time-ranges.patch => 0019-Configurable-fishing-time-ranges.patch} (100%) rename CraftBukkit-Patches/{0021-Allow-nerfed-mobs-to-jump.patch => 0020-Allow-nerfed-mobs-to-jump.patch} (100%) rename CraftBukkit-Patches/{0022-Configurable-interaction-limit-restriction.patch => 0021-Configurable-interaction-limit-restriction.patch} (100%) rename CraftBukkit-Patches/{0023-Add-more-information-to-some-world-crashes.patch => 0022-Add-more-information-to-some-world-crashes.patch} (100%) rename CraftBukkit-Patches/{0024-Make-JSON-errors-more-friendly-and-less-crashy.patch => 0023-Make-JSON-errors-more-friendly-and-less-crashy.patch} (100%) rename CraftBukkit-Patches/{0025-Make-players-in-main-tick-loop-feature-configurable.patch => 0024-Make-players-in-main-tick-loop-feature-configurable.patch} (100%) 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 addd5acd25..0000000000 --- a/CraftBukkit-Patches/0012-Configurable-hunger-multiplier-for-player-sprint-jum.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 0000000000000000000000000000000000000000 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 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 ---- a/src/main/java/net/minecraft/server/EntityHuman.java -+++ b/src/main/java/net/minecraft/server/EntityHuman.java -@@ -0,0 +0,0 @@ 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 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 ---- a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java -+++ b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java -@@ -0,0 +0,0 @@ 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 ); -+ } - } --- \ No newline at end of file diff --git a/CraftBukkit-Patches/0013-Inverted-Daylight-Detector-Toggle.patch b/CraftBukkit-Patches/0012-Inverted-Daylight-Detector-Toggle.patch similarity index 93% rename from CraftBukkit-Patches/0013-Inverted-Daylight-Detector-Toggle.patch rename to CraftBukkit-Patches/0012-Inverted-Daylight-Detector-Toggle.patch index 7597a83bda..12761b48a4 100644 --- a/CraftBukkit-Patches/0013-Inverted-Daylight-Detector-Toggle.patch +++ b/CraftBukkit-Patches/0012-Inverted-Daylight-Detector-Toggle.patch @@ -1,6 +1,6 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: gsand -Date: Tue, 24 Jun 2014 08:01:42 -0500 +From: Zach Brown <1254957+zachbr@users.noreply.github.com> +Date: Sun, 6 Jul 2014 02:46:20 -0500 Subject: [PATCH] Inverted Daylight Detector Toggle @@ -56,7 +56,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 +++ b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java @@ -0,0 +0,0 @@ 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 100% 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 diff --git a/CraftBukkit-Patches/0015-Ability-to-disable-asynccatcher.patch b/CraftBukkit-Patches/0014-Ability-to-disable-asynccatcher.patch similarity index 100% rename from CraftBukkit-Patches/0015-Ability-to-disable-asynccatcher.patch rename to CraftBukkit-Patches/0014-Ability-to-disable-asynccatcher.patch diff --git a/CraftBukkit-Patches/0016-Fix-redstone-lag-issues.patch b/CraftBukkit-Patches/0015-Fix-redstone-lag-issues.patch similarity index 100% rename from CraftBukkit-Patches/0016-Fix-redstone-lag-issues.patch rename to CraftBukkit-Patches/0015-Fix-redstone-lag-issues.patch 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 100% 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 diff --git a/CraftBukkit-Patches/0018-Actually-fix-TNT-movement.patch b/CraftBukkit-Patches/0017-Actually-fix-TNT-movement.patch similarity index 100% rename from CraftBukkit-Patches/0018-Actually-fix-TNT-movement.patch rename to CraftBukkit-Patches/0017-Actually-fix-TNT-movement.patch 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 100% 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 diff --git a/CraftBukkit-Patches/0020-Configurable-fishing-time-ranges.patch b/CraftBukkit-Patches/0019-Configurable-fishing-time-ranges.patch similarity index 100% rename from CraftBukkit-Patches/0020-Configurable-fishing-time-ranges.patch rename to CraftBukkit-Patches/0019-Configurable-fishing-time-ranges.patch diff --git a/CraftBukkit-Patches/0021-Allow-nerfed-mobs-to-jump.patch b/CraftBukkit-Patches/0020-Allow-nerfed-mobs-to-jump.patch similarity index 100% rename from CraftBukkit-Patches/0021-Allow-nerfed-mobs-to-jump.patch rename to CraftBukkit-Patches/0020-Allow-nerfed-mobs-to-jump.patch diff --git a/CraftBukkit-Patches/0022-Configurable-interaction-limit-restriction.patch b/CraftBukkit-Patches/0021-Configurable-interaction-limit-restriction.patch similarity index 100% rename from CraftBukkit-Patches/0022-Configurable-interaction-limit-restriction.patch rename to CraftBukkit-Patches/0021-Configurable-interaction-limit-restriction.patch 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 100% 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 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 100% 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 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 100% 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