summaryrefslogtreecommitdiffstats
path: root/src/main/java/net/minecraft/server/EntityDamageSourceIndirect.java
diff options
context:
space:
mode:
authorErik Broes <erikbroes@grum.nl>2012-01-14 21:03:48 +0100
committerErik Broes <erikbroes@grum.nl>2012-01-15 10:52:37 +0100
commit61ec751ca11f5bff9ec2dd1644982d5628270004 (patch)
tree8829269e1c5807b55566d367bec5ee630d5dfb1d /src/main/java/net/minecraft/server/EntityDamageSourceIndirect.java
parent6495eee0c9fddcce2c2aa9bf9c45118abea180c1 (diff)
downloadcraftbukkit-61ec751ca11f5bff9ec2dd1644982d5628270004.tar
craftbukkit-61ec751ca11f5bff9ec2dd1644982d5628270004.tar.gz
craftbukkit-61ec751ca11f5bff9ec2dd1644982d5628270004.tar.lz
craftbukkit-61ec751ca11f5bff9ec2dd1644982d5628270004.tar.xz
craftbukkit-61ec751ca11f5bff9ec2dd1644982d5628270004.zip
Update for 1.1_01 renames.
We know these updates (can) break plugins bypassing Bukkit. They are needed for smooth updates however. There will be another one right before before 1.1-R1.
Diffstat (limited to 'src/main/java/net/minecraft/server/EntityDamageSourceIndirect.java')
-rw-r--r--src/main/java/net/minecraft/server/EntityDamageSourceIndirect.java12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/main/java/net/minecraft/server/EntityDamageSourceIndirect.java b/src/main/java/net/minecraft/server/EntityDamageSourceIndirect.java
index 410d2660..b8ceace5 100644
--- a/src/main/java/net/minecraft/server/EntityDamageSourceIndirect.java
+++ b/src/main/java/net/minecraft/server/EntityDamageSourceIndirect.java
@@ -2,11 +2,11 @@ package net.minecraft.server;
public class EntityDamageSourceIndirect extends EntityDamageSource {
- private Entity o;
+ private Entity owner;
public EntityDamageSourceIndirect(String s, Entity entity, Entity entity1) {
super(s, entity);
- this.o = entity1;
+ this.owner = entity1;
}
public Entity b() {
@@ -14,13 +14,13 @@ public class EntityDamageSourceIndirect extends EntityDamageSource {
}
public Entity getEntity() {
- return this.o;
+ return this.owner;
}
- public String a(EntityHuman entityhuman) {
+ public String getLocalizedDeathMessage(EntityHuman entityhuman) {
// CraftBukkit start
- String source = (this.o == null) ? "Herobrine" : this.o.ad();
- return LocaleI18n.a("death." + this.n, new Object[] { entityhuman.name, source});
+ String source = (this.owner == null) ? "Herobrine" : this.owner.getLocalizedName();
+ return LocaleI18n.get("death." + this.translationIndex, new Object[] { entityhuman.name, source});
}
public Entity getProximateDamageSource() {