Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-23 19:15:32 +01:00
Code Issues Projects Releases Wiki Activity

BUGFIX: Damage events should be using getDamage() to set damage.

Browse Source
This commit is contained in:
Andrew Ardill 2011-02-28 17:43:56 +11:00
parent 41fea9b40e
commit 76d8016b32
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/net/minecraft/server/EntityHuman.java
View File

@ -370,6 +370,8 @@ public abstract class EntityHuman extends EntityLiving {
if (event.isCancelled()) { if (event.isCancelled()) {
return false; return false;
} }
i = event.getDamage();
} }
// CraftBukkit end // CraftBukkit end

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

@ -124,12 +124,13 @@ public abstract class EntityLiving extends Entity {
CraftServer server = ((WorldServer) this.world).getServer(); CraftServer server = ((WorldServer) this.world).getServer();
org.bukkit.entity.Entity victim = this.getBukkitEntity(); org.bukkit.entity.Entity victim = this.getBukkitEntity();
DamageCause damageType = EntityDamageEvent.DamageCause.SUFFOCATION; DamageCause damageType = EntityDamageEvent.DamageCause.SUFFOCATION;
int damage = 1;
EntityDamageEvent event = new EntityDamageEvent(victim, damageType, 1); EntityDamageEvent event = new EntityDamageEvent(victim, damageType, damage);
server.getPluginManager().callEvent(event); server.getPluginManager().callEvent(event);
if (!event.isCancelled()) { if (!event.isCancelled()) {
this.a((Entity) null, 1); this.a((Entity) null, event.getDamage());
} }
// CraftBukkit end // CraftBukkit end
} }