summaryrefslogtreecommitdiffstats
path: root/src/main/java/net/minecraft/server/PlayerInstance.java
diff options
context:
space:
mode:
authorDinnerbone <dinnerbone@dinnerbone.com>2011-02-23 02:37:56 +0000
committerDinnerbone <dinnerbone@dinnerbone.com>2011-02-23 02:37:56 +0000
commitf759e0b60d3a575d31921c930e436af321b0e7e8 (patch)
tree4b1eb7ac01670854c686b1f6faa2f97ff337f7d7 /src/main/java/net/minecraft/server/PlayerInstance.java
parenta124bfdab59cc9a9d8369425027e61eccd1d62fb (diff)
downloadcraftbukkit-f759e0b60d3a575d31921c930e436af321b0e7e8.tar
craftbukkit-f759e0b60d3a575d31921c930e436af321b0e7e8.tar.gz
craftbukkit-f759e0b60d3a575d31921c930e436af321b0e7e8.tar.lz
craftbukkit-f759e0b60d3a575d31921c930e436af321b0e7e8.tar.xz
craftbukkit-f759e0b60d3a575d31921c930e436af321b0e7e8.zip
Update to Minecraft 1.3 beta
Diffstat (limited to 'src/main/java/net/minecraft/server/PlayerInstance.java')
-rw-r--r--src/main/java/net/minecraft/server/PlayerInstance.java12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/main/java/net/minecraft/server/PlayerInstance.java b/src/main/java/net/minecraft/server/PlayerInstance.java
index 95b8467c..7e326b0a 100644
--- a/src/main/java/net/minecraft/server/PlayerInstance.java
+++ b/src/main/java/net/minecraft/server/PlayerInstance.java
@@ -29,14 +29,14 @@ class PlayerInstance {
this.d = j;
this.e = new ChunkCoordIntPair(i, j);
- playermanager.world.A.d(i, j); // Craftbukkit
+ playermanager.world.u.d(i, j); // Craftbukkit
}
public void a(EntityPlayer entityplayer) {
if (this.b.contains(entityplayer)) {
throw new IllegalStateException("Failed to add player. " + entityplayer + " already is in chunk " + this.c + ", " + this.d);
} else {
- entityplayer.ak.add(this.e);
+ entityplayer.g.add(this.e);
entityplayer.a.b((Packet) (new Packet50PreChunk(this.e.a, this.e.b, true)));
this.b.add(entityplayer);
entityplayer.f.add(this.e);
@@ -56,11 +56,11 @@ class PlayerInstance {
PlayerManager.c(this.a).remove(this);
}
- ((WorldServer)entityplayer.world).A.c(this.c, this.d); // Craftbukkit
+ ((WorldServer)entityplayer.world).u.c(this.c, this.d); // Craftbukkit
}
entityplayer.f.remove(this.e);
- if (entityplayer.ak.contains(this.e)) {
+ if (entityplayer.g.contains(this.e)) {
entityplayer.a.b((Packet) (new Packet50PreChunk(this.c, this.d, false)));
}
}
@@ -115,7 +115,7 @@ class PlayerInstance {
for (int i = 0; i < this.b.size(); ++i) {
EntityPlayer entityplayer = (EntityPlayer) this.b.get(i);
- if (entityplayer.ak.contains(this.e)) {
+ if (entityplayer.g.contains(this.e)) {
entityplayer.a.b(packet);
}
}
@@ -178,7 +178,7 @@ class PlayerInstance {
private void a(TileEntity tileentity) {
if (tileentity != null) {
- Packet packet = tileentity.g();
+ Packet packet = tileentity.e();
if (packet != null) {
this.a(packet);