summaryrefslogtreecommitdiffstats
path: root/src/main/java/net/minecraft/server/NetServerHandler.java
diff options
context:
space:
mode:
authorCeltic Minstrel <celtic.minstrel.ca@>2011-04-15 22:11:13 -0400
committerEvilSeph <evilseph@unaligned.org>2011-05-01 23:40:48 -0400
commit5a5ce79035f7ed3d77974c4eb8bc94b2ffae54e7 (patch)
tree5c01022ac2f21947669a4ef02e3213f491ce2963 /src/main/java/net/minecraft/server/NetServerHandler.java
parent017b15c3a62a2cf066f2ec061da0de582bc5c596 (diff)
downloadcraftbukkit-5a5ce79035f7ed3d77974c4eb8bc94b2ffae54e7.tar
craftbukkit-5a5ce79035f7ed3d77974c4eb8bc94b2ffae54e7.tar.gz
craftbukkit-5a5ce79035f7ed3d77974c4eb8bc94b2ffae54e7.tar.lz
craftbukkit-5a5ce79035f7ed3d77974c4eb8bc94b2ffae54e7.tar.xz
craftbukkit-5a5ce79035f7ed3d77974c4eb8bc94b2ffae54e7.zip
Implemented addRecipe method in CraftServer and associated recipe classes.
Diffstat (limited to 'src/main/java/net/minecraft/server/NetServerHandler.java')
-rw-r--r--src/main/java/net/minecraft/server/NetServerHandler.java9
1 files changed, 7 insertions, 2 deletions
diff --git a/src/main/java/net/minecraft/server/NetServerHandler.java b/src/main/java/net/minecraft/server/NetServerHandler.java
index e1e249ae..8a9ab5f6 100644
--- a/src/main/java/net/minecraft/server/NetServerHandler.java
+++ b/src/main/java/net/minecraft/server/NetServerHandler.java
@@ -823,8 +823,13 @@ public class NetServerHandler extends NetHandler implements ICommandListener {
public void a(Packet102WindowClick packet102windowclick) {
if (this.player.activeContainer.f == packet102windowclick.a && this.player.activeContainer.c(this.player)) {
ItemStack itemstack = this.player.activeContainer.a(packet102windowclick.b, packet102windowclick.c, packet102windowclick.f, this.player);
-
- if (ItemStack.equals(packet102windowclick.e, itemstack)) {
+ // CraftBukkit start
+ boolean clickSuccessful = ItemStack.equals(packet102windowclick.e, itemstack);
+ if ((this.player.activeContainer instanceof ContainerWorkbench || this.player.activeContainer instanceof ContainerPlayer) && packet102windowclick.b == 0) {
+ clickSuccessful = false;
+ }
+ // CraftBukkit end
+ if (clickSuccessful) { // CraftBukkit - extracted to local variable
this.player.netServerHandler.sendPacket(new Packet106Transaction(packet102windowclick.a, packet102windowclick.d, true));
this.player.h = true;
this.player.activeContainer.a();