Remove patch 0012 hunger mulitplier for sprint jump

Newer and better patch coming soon
cc @gsand
This commit is contained in:
Zach Brown 2014-07-06 02:47:46 -05:00
parent 41a98e8541
commit 04b7baf758
14 changed files with 24 additions and 61 deletions

View File

@ -1,37 +0,0 @@
From 30265e6a9f36221e235337b9a8c0217761a9c379 Mon Sep 17 00:00:00 2001
From: gsand <gsandowns@gmail.com>
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

View File

@ -1,6 +1,6 @@
From 0ccf48e94c8a61875c2277840204509f95e65e02 Mon Sep 17 00:00:00 2001 From cb94917c459a2c94181d931cefcf62cd4cbc0ce5 Mon Sep 17 00:00:00 2001
From: gsand <gsandowns@gmail.com> From: Zach Brown <Zbob750@live.com>
Date: Tue, 24 Jun 2014 08:01:42 -0500 Date: Sun, 6 Jul 2014 02:46:20 -0500
Subject: [PATCH] Inverted Daylight Detector Toggle Subject: [PATCH] Inverted Daylight Detector Toggle
@ -51,12 +51,12 @@ index 96e9c37..dc84635 100644
if (l != i1) { if (l != i1) {
i1 = org.bukkit.craftbukkit.event.CraftEventFactory.callRedstoneChange(world, i, j, k, l, i1).getNewCurrent(); // CraftBukkit - Call BlockRedstoneEvent 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 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 --- a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
+++ b/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; + public static boolean InvertedDaylightDetectors;

View File

@ -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 <Zbob750@live.com> From: Zach Brown <Zbob750@live.com>
Date: Tue, 10 Jun 2014 18:22:19 -0500 Date: Tue, 10 Jun 2014 18:22:19 -0500
Subject: [PATCH] Add 1.8 recipes for stone variants Subject: [PATCH] Add 1.8 recipes for stone variants

View File

@ -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 <Zbob750@live.com> From: Zach Brown <Zbob750@live.com>
Date: Wed, 2 Jul 2014 22:34:04 -0500 Date: Wed, 2 Jul 2014 22:34:04 -0500
Subject: [PATCH] Ability to disable asynccatcher 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 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 --- a/src/main/java/org/github/paperspigot/PaperSpigotConfig.java
+++ b/src/main/java/org/github/paperspigot/PaperSpigotConfig.java +++ b/src/main/java/org/github/paperspigot/PaperSpigotConfig.java
@@ -120,4 +120,13 @@ public class PaperSpigotConfig @@ -120,4 +120,13 @@ public class PaperSpigotConfig

View File

@ -1,4 +1,4 @@
From eecbef5691460565f960096f86e8c4c3274cc841 Mon Sep 17 00:00:00 2001 From 73f5bcdfc505cbe22effd9eb8730ad348eb77e67 Mon Sep 17 00:00:00 2001
From: Iceee <andrew@opticgaming.tv> From: Iceee <andrew@opticgaming.tv>
Date: Thu, 12 Jun 2014 13:37:35 -0500 Date: Thu, 12 Jun 2014 13:37:35 -0500
Subject: [PATCH] Fix redstone lag issues Subject: [PATCH] Fix redstone lag issues

View File

@ -1,4 +1,4 @@
From 09f43d297f1e89124a97532b0c02750b0f154fe9 Mon Sep 17 00:00:00 2001 From ac7c65470448906bdc983a919edf2280c1528e12 Mon Sep 17 00:00:00 2001
From: T00thpick1 <t00thpick1dirko@gmail.com> From: T00thpick1 <t00thpick1dirko@gmail.com>
Date: Mon, 23 Jun 2014 21:37:24 -0500 Date: Mon, 23 Jun 2014 21:37:24 -0500
Subject: [PATCH] Do not remove player in world change Subject: [PATCH] Do not remove player in world change

View File

@ -1,4 +1,4 @@
From e5b5b1c567121fc928252436476aad3485adf72a Mon Sep 17 00:00:00 2001 From cd40518ae7eabae3633be74ed13f491158884586 Mon Sep 17 00:00:00 2001
From: Iceee <andrew@opticgaming.tv> From: Iceee <andrew@opticgaming.tv>
Date: Tue, 24 Jun 2014 00:03:34 -0500 Date: Tue, 24 Jun 2014 00:03:34 -0500
Subject: [PATCH] Actually fix TNT movement Subject: [PATCH] Actually fix TNT movement

View File

@ -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 <Zbob750@live.com> From: Zach Brown <Zbob750@live.com>
Date: Tue, 24 Jun 2014 22:55:30 -0500 Date: Tue, 24 Jun 2014 22:55:30 -0500
Subject: [PATCH] Fix zombie sieges and their spawn mechanics Subject: [PATCH] Fix zombie sieges and their spawn mechanics

View File

@ -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 <Zbob750@live.com> From: Zach Brown <Zbob750@live.com>
Date: Sun, 29 Jun 2014 13:22:09 -0500 Date: Sun, 29 Jun 2014 13:22:09 -0500
Subject: [PATCH] Configurable fishing time ranges 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 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 --- a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
+++ b/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 ); InvertedDaylightDetectors = getBoolean( "inverted-daylight-detectors", false );
log( "Inverted Redstone Lamps: " + InvertedDaylightDetectors ); log( "Inverted Redstone Lamps: " + InvertedDaylightDetectors );
} }

View File

@ -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 <Zbob750@live.com> From: Zach Brown <Zbob750@live.com>
Date: Sun, 29 Jun 2014 13:32:36 -0500 Date: Sun, 29 Jun 2014 13:32:36 -0500
Subject: [PATCH] Allow nerfed mobs to jump Subject: [PATCH] Allow nerfed mobs to jump

View File

@ -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 <Zbob750@live.com> From: Zach Brown <Zbob750@live.com>
Date: Thu, 3 Jul 2014 00:53:47 -0500 Date: Thu, 3 Jul 2014 00:53:47 -0500
Subject: [PATCH] Configurable interaction limit restriction Subject: [PATCH] Configurable interaction limit restriction

View File

@ -1,11 +1,11 @@
From f29ac022766836e78146170928e60c288decd347 Mon Sep 17 00:00:00 2001 From 5fe47440dabafd1961f4acca2a29881a87699567 Mon Sep 17 00:00:00 2001
From: Suddenly <suddenly@suddenly.coffee> From: Suddenly <suddenly@suddenly.coffee>
Date: Sat, 5 Jul 2014 16:56:44 +0100 Date: Sat, 5 Jul 2014 16:56:44 +0100
Subject: [PATCH] Add more information to some world crashes 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 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 --- a/src/main/java/net/minecraft/server/WorldNBTStorage.java
+++ b/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 { @@ -54,7 +54,7 @@ public class WorldNBTStorage implements IDataManager, IPlayerFileData {

View File

@ -1,11 +1,11 @@
From 36dd238b869b47e8f0236bfe03ef60240ba9fdb9 Mon Sep 17 00:00:00 2001 From 77bc2b87f2361bc3d936fd7041109ed71aa9a9a4 Mon Sep 17 00:00:00 2001
From: Suddenly <suddenly@suddenly.coffee> From: Suddenly <suddenly@suddenly.coffee>
Date: Mon, 16 Jun 2014 14:44:21 +0100 Date: Mon, 16 Jun 2014 14:44:21 +0100
Subject: [PATCH] Make JSON errors more friendly and less crashy 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 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 --- a/src/main/java/net/minecraft/server/JsonList.java
+++ b/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; @@ -9,6 +9,8 @@ import java.util.ArrayList;
@ -40,7 +40,7 @@ index 36dbcf6..85c6dbc 100644
IOUtils.closeQuietly(bufferedreader); IOUtils.closeQuietly(bufferedreader);
} }
diff --git a/src/main/java/net/minecraft/server/UserCache.java b/src/main/java/net/minecraft/server/UserCache.java 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 --- a/src/main/java/net/minecraft/server/UserCache.java
+++ b/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; @@ -27,6 +27,7 @@ import net.minecraft.util.com.google.gson.GsonBuilder;

View File

@ -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 <Zbob750@live.com> From: Zach Brown <Zbob750@live.com>
Date: Sun, 6 Jul 2014 01:49:28 -0500 Date: Sun, 6 Jul 2014 01:49:28 -0500
Subject: [PATCH] Make players in main tick loop feature configurable Subject: [PATCH] Make players in main tick loop feature configurable