Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-01 06:53:44 +01:00
Code Issues Projects Releases Wiki Activity

Added EntityRegainHealthEvent. Thanks TimWolla!

Browse Source
This commit is contained in:
EvilSeph 2011-06-17 16:50:56 -04:00
parent fadd962b9c
commit f3d25e647f
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -13,6 +13,7 @@ import org.bukkit.event.entity.EntityDamageByBlockEvent;
import org.bukkit.event.entity.EntityDamageEvent; import org.bukkit.event.entity.EntityDamageEvent;
import org.bukkit.event.entity.EntityDamageEvent.DamageCause; import org.bukkit.event.entity.EntityDamageEvent.DamageCause;
import org.bukkit.event.entity.EntityDeathEvent; import org.bukkit.event.entity.EntityDeathEvent;
import org.bukkit.event.entity.EntityRegainHealthEvent;
// CraftBukkit end // CraftBukkit end
public abstract class EntityLiving extends Entity { public abstract class EntityLiving extends Entity {
@ -328,8 +329,17 @@ public abstract class EntityLiving extends Entity {
} }
public void b(int i) { public void b(int i) {
// CraftBukkit start - Added event
if (this.health > 0) { if (this.health > 0) {
this.health += i; CraftServer server = this.world.getServer();
org.bukkit.entity.Entity entity = this.getBukkitEntity();
EntityRegainHealthEvent event = new EntityRegainHealthEvent(entity, i);
server.getPluginManager().callEvent(event);
if (!event.isCancelled()) {
this.health += event.getAmount();
}
// CraftBukkit end
if (this.health > 20) { if (this.health > 20) {
this.health = 20; this.health = 20;
} }