testserver/Spigot-Server-Patches/0124-EntityRegainHealthEven...

46 lines
2.1 KiB
Diff
Raw Normal View History

From 21c7e1d110079977290a2966af83b112bce373a5 Mon Sep 17 00:00:00 2001
2016-04-22 06:48:49 +00:00
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Fri, 22 Apr 2016 01:43:11 -0500
Subject: [PATCH] EntityRegainHealthEvent isFastRegen API
Don't even get me started
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
2016-12-10 23:50:31 +00:00
index 1eee8a3..9a86d84 100644
2016-04-22 06:48:49 +00:00
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
2016-11-17 02:23:38 +00:00
@@ -761,10 +761,16 @@ public abstract class EntityLiving extends Entity {
2016-04-22 06:48:49 +00:00
}
public void heal(float f, EntityRegainHealthEvent.RegainReason regainReason) {
+ // Paper start - Forward
+ heal(f, regainReason, false);
+ }
+
+ public void heal(float f, EntityRegainHealthEvent.RegainReason regainReason, boolean isFastRegen) {
+ // Paper end
float f1 = this.getHealth();
if (f1 > 0.0F) {
- EntityRegainHealthEvent event = new EntityRegainHealthEvent(this.getBukkitEntity(), f, regainReason);
+ EntityRegainHealthEvent event = new EntityRegainHealthEvent(this.getBukkitEntity(), f, regainReason, isFastRegen); // Paper - Add isFastRegen
this.world.getServer().getPluginManager().callEvent(event);
if (!event.isCancelled()) {
diff --git a/src/main/java/net/minecraft/server/FoodMetaData.java b/src/main/java/net/minecraft/server/FoodMetaData.java
2016-11-17 02:23:38 +00:00
index b6e9786..8d95d14 100644
2016-04-22 06:48:49 +00:00
--- 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 >= 10) {
2016-11-17 02:23:38 +00:00
float f = Math.min(this.saturationLevel, 6.0F);
2016-04-22 06:48:49 +00:00
2016-11-17 02:23:38 +00:00
- entityhuman.heal(f / 6.0F, org.bukkit.event.entity.EntityRegainHealthEvent.RegainReason.SATIATED); // CraftBukkit - added RegainReason
+ entityhuman.heal(f / 6.0F, org.bukkit.event.entity.EntityRegainHealthEvent.RegainReason.SATIATED, true); // CraftBukkit - added RegainReason // Paper - This is fast regen
2016-04-22 06:48:49 +00:00
this.a(f);
this.foodTickTimer = 0;
}
--
2016-12-10 23:50:31 +00:00
2.9.3
2016-04-22 06:48:49 +00:00