Update CraftBukkit to Minecraft 1.4.4.

This commit is contained in:
Travis Watkins
2012-11-06 06:05:28 -06:00
parent a0c3b4f9d1
commit 7f7192f8fd
169 changed files with 3295 additions and 2774 deletions

View File

@@ -18,13 +18,12 @@ public class EntityDamageSourceIndirect extends EntityDamageSource {
}
public String getLocalizedDeathMessage(EntityHuman entityhuman) {
// CraftBukkit start
String source = (this.owner == null) ? "Herobrine" : this.owner.getLocalizedName();
return LocaleI18n.get("death." + this.translationIndex, new Object[] { entityhuman.name, source});
return LocaleI18n.get("death." + this.translationIndex, new Object[] { entityhuman.name, this.owner == null ? this.r.getLocalizedName() : this.owner.getLocalizedName()});
}
// CraftBukkit start
public Entity getProximateDamageSource() {
return super.getEntity();
// CraftBukkit end
}
// CraftBukkit end
}