summaryrefslogtreecommitdiffstats
path: root/src/main/java/net/minecraft/server/PlayerInstance.java
diff options
context:
space:
mode:
authorErik Broes <erikbroes@grum.nl>2011-05-14 16:29:42 +0200
committerErik Broes <erikbroes@grum.nl>2011-05-15 13:41:46 +0200
commit309846d732849b68e382c53bf3a0d7a6dfd82579 (patch)
tree020932a024cd2fb20895f5834a2bde7dbdfea583 /src/main/java/net/minecraft/server/PlayerInstance.java
parente54d8c33529b9495b9ca1a610dc2ff9fc5ac84b5 (diff)
downloadcraftbukkit-309846d732849b68e382c53bf3a0d7a6dfd82579.tar
craftbukkit-309846d732849b68e382c53bf3a0d7a6dfd82579.tar.gz
craftbukkit-309846d732849b68e382c53bf3a0d7a6dfd82579.tar.lz
craftbukkit-309846d732849b68e382c53bf3a0d7a6dfd82579.tar.xz
craftbukkit-309846d732849b68e382c53bf3a0d7a6dfd82579.zip
Whitespace + general cleanup
Diffstat (limited to 'src/main/java/net/minecraft/server/PlayerInstance.java')
-rw-r--r--src/main/java/net/minecraft/server/PlayerInstance.java9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/main/java/net/minecraft/server/PlayerInstance.java b/src/main/java/net/minecraft/server/PlayerInstance.java
index 60802ff9..1c980229 100644
--- a/src/main/java/net/minecraft/server/PlayerInstance.java
+++ b/src/main/java/net/minecraft/server/PlayerInstance.java
@@ -42,6 +42,7 @@ class PlayerInstance {
entityplayer.netServerHandler.sendPacket(new Packet50PreChunk(this.e.x, this.e.z, true));
}
// CraftBukkit end
+
this.b.add(entityplayer);
entityplayer.f.add(this.e);
}
@@ -50,7 +51,7 @@ class PlayerInstance {
public void b(EntityPlayer entityplayer) {
if (!this.b.contains(entityplayer)) {
// CraftBukkit - reduce console spam under certain conditions
- //(new IllegalStateException("Failed to remove player. " + entityplayer + " isn\'t in chunk " + this.chunkX + ", " + this.chunkZ)).printStackTrace();
+ // (new IllegalStateException("Failed to remove player. " + entityplayer + " isn\'t in chunk " + this.chunkX + ", " + this.chunkZ)).printStackTrace();
} else {
this.b.remove(entityplayer);
if (this.b.size() == 0) {
@@ -66,7 +67,8 @@ class PlayerInstance {
}
entityplayer.f.remove(this.e);
- if (entityplayer.g.remove(this.e)) { // CraftBukkit - contains -> remove
+ // CraftBukkit - contains -> remove
+ if (entityplayer.g.remove(this.e)) {
entityplayer.netServerHandler.sendPacket(new Packet50PreChunk(this.chunkX, this.chunkZ, false));
}
}
@@ -173,9 +175,10 @@ class PlayerInstance {
j = this.chunkX * 16 + (this.dirtyCount >> 12 & 15);
k = this.dirtyCount & 255;
l = this.chunkZ * 16 + (this.dirtyCount >> 8 & 15);
+
// CraftBukkit start
if (Block.isTileEntity[this.playerManager.world.getTypeId(j, k, l)]) {
- //System.out.println("Sending!"); // CraftBukkit
+ // System.out.println("Sending!"); // CraftBukkit
this.sendTileEntity(this.playerManager.world.getTileEntity(j, k, l));
}
// CraftBukkit end