69 lines
3.2 KiB
Diff
69 lines
3.2 KiB
Diff
|
From 8a5b07ff394ea730f43b69c19c4500f542f505f4 Mon Sep 17 00:00:00 2001
|
||
|
|
From: lazertester <austin.techhead@gmail.com>
|
||
|
|
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
|
||
|
|
|