twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-08-14 03:35:51 -07:00
Code Issues Packages Projects Releases Wiki Activity

Added reasons for entities regaining health.

Browse Source
This commit is contained in:
EvilSeph
2011-06-28 20:11:23 -04:00
parent f518ced9ad
commit 8a521ec629
4 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/net/minecraft/server/EntityLiving.java
View File

@@ -9,6 +9,7 @@ import org.bukkit.event.entity.EntityDamageByBlockEvent;
import org.bukkit.event.entity.EntityDamageEvent;
import org.bukkit.event.entity.EntityDeathEvent;
import org.bukkit.event.entity.EntityRegainHealthEvent;
import org.bukkit.event.entity.EntityRegainHealthEvent.RegainReason;
// CraftBukkit end
public abstract class EntityLiving extends Entity {
@@ -313,10 +314,14 @@ public abstract class EntityLiving extends Entity {
super.b(f, f1);
}
// CraftBukkit start - delegate so we can handle providing a reason for health being regained
public void b(int i) {
// CraftBukkit start - Added event
b(i, RegainReason.CUSTOM);
}
public void b(int i, RegainReason regainReason) {
if (this.health > 0) {
EntityRegainHealthEvent event = new EntityRegainHealthEvent(this.getBukkitEntity(), i);
EntityRegainHealthEvent event = new EntityRegainHealthEvent(this.getBukkitEntity(), i, regainReason);
this.world.getServer().getPluginManager().callEvent(event);
if (!event.isCancelled()) {