OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-03 13:36:44 +01:00
Code Issues Projects Releases Packages Wiki Activity

Properly handle PLAYER_ITEM and its clickedFace.

Browse source
This commit is contained in:
Erik Broes 2011-02-25 21:59:35 +01:00
parent 666c968dab
commit 61339bcb2a
1 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/main/java/net/minecraft/server/NetServerHandler.java
View file

@ -58,6 +58,7 @@ public class NetServerHandler extends NetHandler implements ICommandListener {
// Store the last block right clicked and what type it was // Store the last block right clicked and what type it was
private CraftBlock lastRightClicked; private CraftBlock lastRightClicked;
private BlockFace lastRightClickedFace;
private int lastMaterial; private int lastMaterial;
public CraftPlayer getPlayer() { public CraftPlayer getPlayer() {
@ -415,28 +416,25 @@ public class NetServerHandler extends NetHandler implements ICommandListener {
boolean flag = ((WorldServer) this.e.world).v = this.d.f.h(this.e.name); boolean flag = ((WorldServer) this.e.world).v = this.d.f.h(this.e.name);
CraftBlock blockClicked = null; CraftBlock blockClicked = null;
BlockFace blockFace = null; BlockFace blockFace = BlockFace.SELF;
if (packet15place.d == 255) { if (packet15place.d == 255) {
// CraftBukkit ITEM_USE -- if we have a lastRightClicked then it could be a usable location // CraftBukkit ITEM_USE -- if we have a lastRightClicked then it could be a usable location
if (packet15place.e != null && packet15place.e.id == lastMaterial) { if ((packet15place.e != null && packet15place.e.id == lastMaterial) || lastMaterial == 0) {
blockClicked = lastRightClicked; blockClicked = this.lastRightClicked;
} else if (lastMaterial == 0) { blockFace = this.lastRightClickedFace;
blockClicked = lastRightClicked;
} }
lastRightClicked = null; this.lastRightClicked = null;
lastMaterial = 0; this.lastRightClickedFace = null;
this.lastMaterial = 0;
} else { } else {
// CraftBukkit RIGHTCLICK or BLOCK_PLACE .. or nothing // CraftBukkit RIGHTCLICK or BLOCK_PLACE .. or nothing
blockClicked = (CraftBlock) ((WorldServer) e.world).getWorld().getBlockAt(packet15place.a, packet15place.b, packet15place.c); blockClicked = (CraftBlock) ((WorldServer) e.world).getWorld().getBlockAt(packet15place.a, packet15place.b, packet15place.c);
lastRightClicked = blockClicked;
lastMaterial = (packet15place.e == null) ? 0 : packet15place.e.id;
}
if (blockClicked != null && itemstack != null) {
blockFace = CraftBlock.notchToBlockFace(packet15place.d); blockFace = CraftBlock.notchToBlockFace(packet15place.d);
} else {
blockFace = BlockFace.SELF; this.lastRightClicked = blockClicked;
this.lastMaterial = (packet15place.e == null) ? 0 : packet15place.e.id;
this.lastRightClickedFace = blockFace;
} }
// CraftBukkit if rightclick decremented the item, always send the update packet. // CraftBukkit if rightclick decremented the item, always send the update packet.
@ -484,6 +482,7 @@ public class NetServerHandler extends NetHandler implements ICommandListener {
int j = packet15place.b; int j = packet15place.b;
int k = packet15place.c; int k = packet15place.c;
int l = packet15place.d; int l = packet15place.d;
// CraftBukkit // CraftBukkit
ChunkCoordinates chunkcoordinates = this.e.world.l(); ChunkCoordinates chunkcoordinates = this.e.world.l();
int i1 = (int) MathHelper.e((float) (i - chunkcoordinates.a)); int i1 = (int) MathHelper.e((float) (i - chunkcoordinates.a));
@ -502,6 +501,7 @@ public class NetServerHandler extends NetHandler implements ICommandListener {
this.e.c.a(this.e, this.e.world, itemstack, i, j, k, l); this.e.c.a(this.e, this.e.world, itemstack, i, j, k, l);
this.e.a.b((Packet) (new Packet53BlockChange(i, j, k, this.e.world))); this.e.a.b((Packet) (new Packet53BlockChange(i, j, k, this.e.world)));
// CraftBukkit end // CraftBukkit end
if (l == 0) { if (l == 0) {
--j; --j;
} }