2016-03-11 21:16:41 +00:00
|
|
|
From 6736f5d4df51b5ac2086aa3261879a02f96ab78a Mon Sep 17 00:00:00 2001
|
2014-08-17 21:47:36 +00:00
|
|
|
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
|
2016-03-11 21:16:41 +00:00
|
|
|
index 9042a4c..11fdee8 100644
|
2014-08-17 21:47:36 +00:00
|
|
|
--- a/src/main/java/net/minecraft/server/EntityHuman.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/EntityHuman.java
|
2016-03-11 21:16:41 +00:00
|
|
|
@@ -1139,7 +1139,7 @@ public abstract class EntityHuman extends EntityLiving {
|
2014-08-17 21:47:36 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
- this.applyExhaustion(0.3F);
|
|
|
|
+ this.applyExhaustion(world.spigotConfig.combatExhaustion); // Spigot - Change to use configurable value
|
2016-02-29 21:33:06 +00:00
|
|
|
} else {
|
|
|
|
this.world.a((EntityHuman) null, this.locX, this.locY, this.locZ, SoundEffects.dY, this.bz(), 1.0F, 1.0F);
|
|
|
|
if (flag4) {
|
2016-03-11 21:16:41 +00:00
|
|
|
@@ -1406,9 +1406,9 @@ public abstract class EntityHuman extends EntityLiving {
|
2016-02-29 21:33:06 +00:00
|
|
|
super.ch();
|
|
|
|
this.b(StatisticList.w);
|
2014-08-17 21:47:36 +00:00
|
|
|
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
|
|
|
|
}
|
|
|
|
|
2014-11-28 01:17:45 +00:00
|
|
|
}
|
2014-08-17 21:47:36 +00:00
|
|
|
diff --git a/src/main/java/net/minecraft/server/FoodMetaData.java b/src/main/java/net/minecraft/server/FoodMetaData.java
|
2016-02-29 21:33:06 +00:00
|
|
|
index 7fa3a33..ccd7a46 100644
|
2014-08-17 21:47:36 +00:00
|
|
|
--- a/src/main/java/net/minecraft/server/FoodMetaData.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/FoodMetaData.java
|
2016-02-29 21:33:06 +00:00
|
|
|
@@ -74,7 +74,7 @@ public class FoodMetaData {
|
2014-08-17 21:47:36 +00:00
|
|
|
if (this.foodTickTimer >= 80) {
|
|
|
|
// CraftBukkit - added RegainReason
|
|
|
|
entityhuman.heal(1.0F, org.bukkit.event.entity.EntityRegainHealthEvent.RegainReason.SATIATED);
|
2016-02-29 21:33:06 +00:00
|
|
|
- this.a(4.0F);
|
2014-08-17 21:47:36 +00:00
|
|
|
+ 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
|
2016-02-29 21:33:06 +00:00
|
|
|
index 7cf8f2d..4cbcd14 100644
|
2014-08-17 21:47:36 +00:00
|
|
|
--- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
|
|
|
|
+++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
|
2016-02-29 21:33:06 +00:00
|
|
|
@@ -252,4 +252,16 @@ public class SpigotWorldConfig
|
2014-08-17 21:47:36 +00:00
|
|
|
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 );
|
|
|
|
+ }
|
|
|
|
}
|
|
|
|
--
|
2016-02-29 21:33:06 +00:00
|
|
|
2.5.0
|
2014-08-17 21:47:36 +00:00
|
|
|
|