Chronika/Rekkit
1
0
Fork 0
Code Issues Pull Requests Actions 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

10
src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
View File

@@ -41,7 +41,7 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
}
if (entity instanceof EntityPlayer && health == 0) {
((EntityPlayer) entity).die(DamageSource.j);
((EntityPlayer) entity).die(DamageSource.GENERIC);
}
getHandle().health = health;
@@ -176,16 +176,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
}
public void damage(int amount) {
entity.damageEntity(DamageSource.j, amount);
entity.damageEntity(DamageSource.GENERIC, amount);
}
public void damage(int amount, org.bukkit.entity.Entity source) {
DamageSource reason = DamageSource.a.j;
DamageSource reason = DamageSource.GENERIC;
if (source instanceof HumanEntity) {
reason = DamageSource.b(((CraftHumanEntity)source).getHandle());
reason = DamageSource.playerAttack(((CraftHumanEntity)source).getHandle());
} else if (source instanceof LivingEntity) {
reason = DamageSource.a(((CraftLivingEntity)source).getHandle());
reason = DamageSource.mobAttack(((CraftLivingEntity)source).getHandle());
}
entity.damageEntity(reason, amount);