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

Rename revision 2

Browse Source
This commit is contained in:
Dinnerbone
2011-09-15 17:36:27 +01:00
parent 3c5632de31
commit 2b5a61f03d
29 changed files with 126 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -133,7 +133,7 @@ public abstract class EntityLiving extends Entity {
this.world.getServer().getPluginManager().callEvent(event);
if (!event.isCancelled()) {
this.damageEntity(DamageSource.d, event.getDamage());
this.damageEntity(DamageSource.STUCK, event.getDamage());
}
// CraftBukkit end
}
@@ -162,7 +162,7 @@ public abstract class EntityLiving extends Entity {
this.world.getServer().getPluginManager().callEvent(event);
if (!event.isCancelled() && event.getDamage() != 0) {
this.damageEntity(DamageSource.e, event.getDamage());
this.damageEntity(DamageSource.DROWN, event.getDamage());
}
// CraftBukkit end
}
@@ -412,7 +412,7 @@ public abstract class EntityLiving extends Entity {
}
this.ar = 0.0F;
Entity entity = damagesource.a();
Entity entity = damagesource.getEntity();
if (entity != null) {
if (entity instanceof EntityHuman) {
@@ -499,7 +499,7 @@ public abstract class EntityLiving extends Entity {
}
public void die(DamageSource damagesource) {
Entity entity = damagesource.a();
Entity entity = damagesource.getEntity();
if (this.ag >= 0 && entity != null) {
entity.b(this, this.ag);
@@ -553,7 +553,7 @@ public abstract class EntityLiving extends Entity {
this.world.getServer().getPluginManager().callEvent(event);
if (!event.isCancelled() && event.getDamage() != 0) {
this.damageEntity(DamageSource.h, event.getDamage());
this.damageEntity(DamageSource.FALL, event.getDamage());
}
// CraftBukkit end
@@ -973,7 +973,7 @@ public abstract class EntityLiving extends Entity {
return;
}
this.damageEntity(DamageSource.i, event.getDamage());
this.damageEntity(DamageSource.OUT_OF_WORLD, event.getDamage());
// CraftBukkit end
}