Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-27 21:19:00 +01:00
Code Issues Projects Releases Wiki Activity

Fix getDisplayName getting lost when getBukkitEntity is called

Browse Source
This commit is contained in:
Erik Broes 2011-03-13 12:52:01 +01:00
parent 1be1b5ab4d
commit 6043797ce0
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/net/minecraft/server/EntityPlayer.java
View File

@ -50,8 +50,14 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
this.name = s; this.name = s;
this.c = iteminworldmanager; this.c = iteminworldmanager;
this.height = 0.0F; this.height = 0.0F;
// CraftBukkit start
this.displayName = this.name;
} }
public String displayName;
// CraftBukkit end
public void l() { public void l() {
this.activeContainer.a((ICrafting) this); this.activeContainer.a((ICrafting) this);
} }

6
src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
View File

@ -17,11 +17,9 @@ import org.bukkit.craftbukkit.TextWrapper;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
public class CraftPlayer extends CraftHumanEntity implements Player { public class CraftPlayer extends CraftHumanEntity implements Player {
private String name;
public CraftPlayer(CraftServer server, EntityPlayer entity) { public CraftPlayer(CraftServer server, EntityPlayer entity) {
super(server, entity); super(server, entity);
name = getName();
} }
public boolean isOp() { public boolean isOp() {
@ -88,11 +86,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
} }
public String getDisplayName() { public String getDisplayName() {
return name; return getHandle().displayName;
} }
public void setDisplayName(final String name) { public void setDisplayName(final String name) {
this.name = name; getHandle().displayName = name;
} }
@Override @Override