mirror of
https://hub.spigotmc.org/stash/scm/spigot/craftbukkit.git
synced 2024-11-25 05:46:13 +00:00
97 lines
4.5 KiB
Diff
97 lines
4.5 KiB
Diff
--- a/net/minecraft/world/food/FoodMetaData.java
|
|
+++ b/net/minecraft/world/food/FoodMetaData.java
|
|
@@ -7,12 +7,22 @@
|
|
import net.minecraft.world.EnumDifficulty;
|
|
import net.minecraft.world.level.GameRules;
|
|
|
|
+// CraftBukkit start
|
|
+import net.minecraft.network.protocol.game.PacketPlayOutUpdateHealth;
|
|
+import net.minecraft.world.item.ItemStack;
|
|
+// CraftBukkit end
|
|
+
|
|
public class FoodMetaData {
|
|
|
|
public int foodLevel = 20;
|
|
public float saturationLevel = 5.0F;
|
|
public float exhaustionLevel;
|
|
private int tickTimer;
|
|
+ // CraftBukkit start
|
|
+ public int saturatedRegenRate = 10;
|
|
+ public int unsaturatedRegenRate = 80;
|
|
+ public int starvationRate = 80;
|
|
+ // CraftBukkit end
|
|
|
|
public FoodMetaData() {}
|
|
|
|
@@ -29,6 +39,20 @@
|
|
this.add(foodinfo.nutrition(), foodinfo.saturation());
|
|
}
|
|
|
|
+ // CraftBukkit start
|
|
+ public void eat(FoodInfo foodinfo, ItemStack itemstack, EntityPlayer entityplayer) {
|
|
+ int oldFoodLevel = foodLevel;
|
|
+
|
|
+ org.bukkit.event.entity.FoodLevelChangeEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callFoodLevelChangeEvent(entityplayer, foodinfo.nutrition() + oldFoodLevel, itemstack);
|
|
+
|
|
+ if (!event.isCancelled()) {
|
|
+ this.add(event.getFoodLevel() - oldFoodLevel, foodinfo.saturation());
|
|
+ }
|
|
+
|
|
+ entityplayer.getBukkitEntity().sendHealthUpdate();
|
|
+ }
|
|
+ // CraftBukkit end
|
|
+
|
|
public void tick(EntityPlayer entityplayer) {
|
|
WorldServer worldserver = entityplayer.serverLevel();
|
|
EnumDifficulty enumdifficulty = worldserver.getDifficulty();
|
|
@@ -38,7 +62,15 @@
|
|
if (this.saturationLevel > 0.0F) {
|
|
this.saturationLevel = Math.max(this.saturationLevel - 1.0F, 0.0F);
|
|
} else if (enumdifficulty != EnumDifficulty.PEACEFUL) {
|
|
- this.foodLevel = Math.max(this.foodLevel - 1, 0);
|
|
+ // CraftBukkit start
|
|
+ org.bukkit.event.entity.FoodLevelChangeEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callFoodLevelChangeEvent(entityplayer, Math.max(this.foodLevel - 1, 0));
|
|
+
|
|
+ if (!event.isCancelled()) {
|
|
+ this.foodLevel = event.getFoodLevel();
|
|
+ }
|
|
+
|
|
+ entityplayer.connection.send(new PacketPlayOutUpdateHealth(entityplayer.getBukkitEntity().getScaledHealth(), this.foodLevel, this.saturationLevel));
|
|
+ // CraftBukkit end
|
|
}
|
|
}
|
|
|
|
@@ -46,23 +78,25 @@
|
|
|
|
if (flag && this.saturationLevel > 0.0F && entityplayer.isHurt() && this.foodLevel >= 20) {
|
|
++this.tickTimer;
|
|
- if (this.tickTimer >= 10) {
|
|
+ if (this.tickTimer >= this.saturatedRegenRate) { // CraftBukkit
|
|
float f = Math.min(this.saturationLevel, 6.0F);
|
|
|
|
- entityplayer.heal(f / 6.0F);
|
|
- this.addExhaustion(f);
|
|
+ entityplayer.heal(f / 6.0F, org.bukkit.event.entity.EntityRegainHealthEvent.RegainReason.SATIATED); // CraftBukkit - added RegainReason
|
|
+ // this.addExhaustion(f); CraftBukkit - EntityExhaustionEvent
|
|
+ entityplayer.causeFoodExhaustion(f, org.bukkit.event.entity.EntityExhaustionEvent.ExhaustionReason.REGEN); // CraftBukkit - EntityExhaustionEvent
|
|
this.tickTimer = 0;
|
|
}
|
|
} else if (flag && this.foodLevel >= 18 && entityplayer.isHurt()) {
|
|
++this.tickTimer;
|
|
- if (this.tickTimer >= 80) {
|
|
- entityplayer.heal(1.0F);
|
|
- this.addExhaustion(6.0F);
|
|
+ if (this.tickTimer >= this.unsaturatedRegenRate) { // CraftBukkit - add regen rate manipulation
|
|
+ entityplayer.heal(1.0F, org.bukkit.event.entity.EntityRegainHealthEvent.RegainReason.SATIATED); // CraftBukkit - added RegainReason
|
|
+ // this.addExhaustion(6.0F); CraftBukkit - EntityExhaustionEvent
|
|
+ entityplayer.causeFoodExhaustion(6.0f, org.bukkit.event.entity.EntityExhaustionEvent.ExhaustionReason.REGEN); // CraftBukkit - EntityExhaustionEvent
|
|
this.tickTimer = 0;
|
|
}
|
|
} else if (this.foodLevel <= 0) {
|
|
++this.tickTimer;
|
|
- if (this.tickTimer >= 80) {
|
|
+ if (this.tickTimer >= this.starvationRate) { // CraftBukkit - add regen rate manipulation
|
|
if (entityplayer.getHealth() > 10.0F || enumdifficulty == EnumDifficulty.HARD || entityplayer.getHealth() > 1.0F && enumdifficulty == EnumDifficulty.NORMAL) {
|
|
entityplayer.hurtServer(worldserver, entityplayer.damageSources().starve(), 1.0F);
|
|
}
|