Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-27 13:06:02 +01:00
Code Issues Projects Releases Wiki Activity

Minor logic change and small cleanups

Browse Source
This commit is contained in:
Erik Broes 2011-03-24 12:11:28 +01:00
parent 748b71b3cc
commit d6c3fe23e5
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/net/minecraft/server/ItemInWorldManager.java
View File

@ -195,16 +195,17 @@ public class ItemInWorldManager {
boolean result = false;
if (i1 > 0) {
PlayerInteractEvent event = CraftEventFactory.callPlayerInteractEvent(entityhuman, Action.RIGHT_CLICK_BLOCK, i, j, k, l, itemstack);
if (event.useInteractedBlock() == Event.Result.DENY) {
if (event.useInteractedBlock() == Event.Result.DENY) {
// If we denied a door from opening, we need to send a correcting update to the client, as it already opened the door.
if (i1 == Block.WOODEN_DOOR.id) {
boolean bottom = (world.getData(i, j, k) & 8) == 0;
((EntityPlayer) entityhuman).a.b((Packet) (new Packet53BlockChange(i, j + (bottom ? 1 : -1), k, world)));
((EntityPlayer) entityhuman).a.b((Packet) (new Packet53BlockChange(i, j + (bottom ? 1 : -1), k, world)));
}
} else {
result = Block.byId[i1].a(world, i, j, k, entityhuman);
}
if (itemstack != null && event.useItemInHand() != Event.Result.DENY && (!result || event.useItemInHand() == Event.Result.ALLOW)) {
// If we have 'true' and no explicit deny *or* an explicit allow -- run the item part of the hook
if (itemstack != null && ((!result && event.useItemInHand() != Event.Result.DENY) || event.useItemInHand() == Event.Result.ALLOW)) {
result = itemstack.a(entityhuman, world, i, j, k, l);
}
}

4
src/main/java/net/minecraft/server/NetServerHandler.java
View File

@ -374,7 +374,7 @@ public class NetServerHandler extends NetHandler implements ICommandListener {
}
public void a(Packet15Place packet15place) {
// CraftBukkit
// CraftBukkit start
// This is a horrible hack needed because the client sends 2 packets on 'right mouse click'
// aimed at a block. We shouldn't need to get the second packet if the data is handled
// but we cannot know what the client will do, so we might still get it
@ -409,7 +409,7 @@ public class NetServerHandler extends NetHandler implements ICommandListener {
return;
}
// Don't call this event if using Buckets / signs
// CraftBukkit start
PlayerInteractEvent event = CraftEventFactory.callPlayerInteractEvent(this.e, Action.RIGHT_CLICK_AIR, itemstack);
if (!event.isCancelled()) {