summaryrefslogtreecommitdiffstats
path: root/src/main/java/net/minecraft/server/NetServerHandler.java
diff options
context:
space:
mode:
authorDinnerbone <dinnerbone@dinnerbone.com>2011-06-29 23:02:25 +0100
committerDinnerbone <dinnerbone@dinnerbone.com>2011-06-30 15:19:25 +0100
commita679e7f38025924dba3dd688ccb87e92306c4c3e (patch)
tree604a20c893873bef01a92eaa09d9309f32b7e29c /src/main/java/net/minecraft/server/NetServerHandler.java
parenta98c7ba2c706caa0ba83bddefa5ffecbe658ccd3 (diff)
downloadcraftbukkit-a679e7f38025924dba3dd688ccb87e92306c4c3e.tar
craftbukkit-a679e7f38025924dba3dd688ccb87e92306c4c3e.tar.gz
craftbukkit-a679e7f38025924dba3dd688ccb87e92306c4c3e.tar.lz
craftbukkit-a679e7f38025924dba3dd688ccb87e92306c4c3e.tar.xz
craftbukkit-a679e7f38025924dba3dd688ccb87e92306c4c3e.zip
Update to Minecraft 1.7
Diffstat (limited to 'src/main/java/net/minecraft/server/NetServerHandler.java')
-rw-r--r--src/main/java/net/minecraft/server/NetServerHandler.java10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/main/java/net/minecraft/server/NetServerHandler.java b/src/main/java/net/minecraft/server/NetServerHandler.java
index 9564e89e..b9877f17 100644
--- a/src/main/java/net/minecraft/server/NetServerHandler.java
+++ b/src/main/java/net/minecraft/server/NetServerHandler.java
@@ -102,7 +102,7 @@ public class NetServerHandler extends NetHandler implements ICommandListener {
s = event.getReason();
// CraftBukkit end
- this.player.A();
+ this.player.B();
this.sendPacket(new Packet255KickDisconnect(s));
this.networkManager.d();
@@ -427,7 +427,7 @@ public class NetServerHandler extends NetHandler implements ICommandListener {
WorldServer worldserver = this.minecraftServer.getWorldServer(this.player.dimension);
if (packet14blockdig.e == 4) {
- this.player.E();
+ this.player.F();
} else {
boolean flag = worldserver.weirdIsOpCache = worldserver.dimension != 0 || this.minecraftServer.serverConfigurationManager.isOp(this.player.name); // CraftBukkit
boolean flag1 = false;
@@ -800,7 +800,7 @@ public class NetServerHandler extends NetHandler implements ICommandListener {
this.server.getPluginManager().callEvent(event);
// CraftBukkit end
- this.player.k_();
+ this.player.w();
}
}
@@ -889,7 +889,7 @@ public class NetServerHandler extends NetHandler implements ICommandListener {
public void a(Packet101CloseWindow packet101closewindow) {
if (this.player.dead) return; // CraftBukkit
- this.player.z();
+ this.player.A();
}
public void a(Packet102WindowClick packet102windowclick) {
@@ -902,7 +902,7 @@ public class NetServerHandler extends NetHandler implements ICommandListener {
this.player.netServerHandler.sendPacket(new Packet106Transaction(packet102windowclick.a, packet102windowclick.d, true));
this.player.h = true;
this.player.activeContainer.a();
- this.player.y();
+ this.player.z();
this.player.h = false;
} else {
this.n.put(Integer.valueOf(this.player.activeContainer.windowId), Short.valueOf(packet102windowclick.d));