Update to Minecraft 1.8.3

By: Thinkofdeath <thinkofdeath@spigotmc.org>
This commit is contained in:
CraftBukkit/Spigot
2015-02-26 22:41:06 +00:00
parent d789ce91d4
commit 85be409b13
347 changed files with 5027 additions and 5465 deletions

View File

@@ -1,9 +1,16 @@
--- ../work/decompile-8eb82bde//net/minecraft/server/FoodMetaData.java 2014-11-28 17:43:43.193707433 +0000
+++ src/main/java/net/minecraft/server/FoodMetaData.java 2014-11-28 17:38:19.000000000 +0000
@@ -6,9 +6,17 @@
public float saturationLevel = 5.0F;
public float exhaustionLevel;
public int foodTickTimer;
--- /home/matt/mc-dev-private//net/minecraft/server/FoodMetaData.java 2015-02-26 22:40:22.751608138 +0000
+++ src/main/java/net/minecraft/server/FoodMetaData.java 2015-02-26 22:40:22.751608138 +0000
@@ -2,13 +2,21 @@
public class FoodMetaData {
- private int foodLevel = 20;
- private float saturationLevel = 5.0F;
- private float exhaustionLevel;
+ public int foodLevel = 20; // CraftBukkit - public
+ public float saturationLevel = 5.0F; // CraftBukkit - public
+ public float exhaustionLevel; // CraftBukkit - public
private int foodTickTimer;
+ private EntityHuman entityhuman; // CraftBukkit
private int e = 20;
@@ -55,7 +62,7 @@
}
}
if (entityhuman.world.getGameRules().getBoolean("naturalRegeneration") && this.foodLevel >= 18 && entityhuman.cl()) {
if (entityhuman.world.getGameRules().getBoolean("naturalRegeneration") && this.foodLevel >= 18 && entityhuman.cm()) {
++this.foodTickTimer;
if (this.foodTickTimer >= 80) {
- entityhuman.heal(1.0F);