43 lines
2.5 KiB
Diff
43 lines
2.5 KiB
Diff
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
|
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/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
||
|
|
index a326e5b4ac055f2f8a95c6eaccd8d0a97762da1f..1131d86080b3100437aa18a00c6277fcea4b7ea8 100644
|
||
|
|
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
||
|
|
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
||
|
|
@@ -1127,10 +1127,16 @@ public abstract class LivingEntity extends Entity {
|
||
|
|
}
|
||
|
|
|
||
|
|
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
|
||
|
|
// Suppress during worldgen
|
||
|
|
if (this.valid) {
|
||
|
|
this.level.getCraftServer().getPluginManager().callEvent(event);
|
||
|
|
diff --git a/src/main/java/net/minecraft/world/food/FoodData.java b/src/main/java/net/minecraft/world/food/FoodData.java
|
||
|
|
index 269392592f5271b1bb8c37661fbe685e76e32b74..d18b7d2c22312fc6ec3977ce38a1f04e0b5c8ad4 100644
|
||
|
|
--- a/src/main/java/net/minecraft/world/food/FoodData.java
|
||
|
|
+++ b/src/main/java/net/minecraft/world/food/FoodData.java
|
||
|
|
@@ -84,7 +84,7 @@ public class FoodData {
|
||
|
|
if (this.tickTimer >= this.saturatedRegenRate) { // CraftBukkit
|
||
|
|
float f = Math.min(this.saturationLevel, 6.0F);
|
||
|
|
|
||
|
|
- player.heal(f / 6.0F, org.bukkit.event.entity.EntityRegainHealthEvent.RegainReason.SATIATED); // CraftBukkit - added RegainReason
|
||
|
|
+ player.heal(f / 6.0F, org.bukkit.event.entity.EntityRegainHealthEvent.RegainReason.SATIATED, true); // CraftBukkit - added RegainReason // Paper - This is fast regen
|
||
|
|
// this.a(f); CraftBukkit - EntityExhaustionEvent
|
||
|
|
player.applyExhaustion(f, org.bukkit.event.entity.EntityExhaustionEvent.ExhaustionReason.REGEN); // CraftBukkit - EntityExhaustionEvent
|
||
|
|
this.tickTimer = 0;
|