twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-08-16 20:53:54 -07:00
Code Issues Packages Projects Releases Wiki Activity

Update for 1.1_01 renames.

Browse Source 
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.
This commit is contained in:
Erik Broes
2012-01-14 21:03:48 +01:00
parent 6495eee0c9
commit 61ec751ca1
85 changed files with 466 additions and 456 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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() {