geforkt von Mirrors/Paper
28414e7e28
6669d6ecd2b b2740df50bb bf71dc61149 fba27a2ea80 92ee7e7f8ec b28f0d3de23 4beb4ac3918 0ddb6f3dde8 afe301fe892 b8f6402bbbe
69 Zeilen
3.1 KiB
Diff
69 Zeilen
3.1 KiB
Diff
From 1372f29a869fc690cf3f386b6e9dc09532200ddd 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 cf1cf37..4ccd4d5 100644
|
|
--- a/src/main/java/net/minecraft/server/EntityHuman.java
|
|
+++ b/src/main/java/net/minecraft/server/EntityHuman.java
|
|
@@ -1085,7 +1085,7 @@ public abstract class EntityHuman extends EntityLiving {
|
|
}
|
|
}
|
|
|
|
- this.applyExhaustion(0.3F);
|
|
+ this.applyExhaustion(world.spigotConfig.combatExhaustion); // Spigot - Change to use configurable value
|
|
} else if (flag1) {
|
|
entity.extinguish();
|
|
}
|
|
@@ -1332,9 +1332,9 @@ public abstract class EntityHuman extends EntityLiving {
|
|
super.bE();
|
|
this.b(StatisticList.u);
|
|
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 23aca22..1b44990 100644
|
|
--- a/src/main/java/net/minecraft/server/FoodMetaData.java
|
|
+++ b/src/main/java/net/minecraft/server/FoodMetaData.java
|
|
@@ -63,7 +63,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 c3a2d01..3f145b3 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 );
|
|
+ }
|
|
}
|
|
--
|
|
2.1.0
|
|
|