Update from upstream SpigotMC

6669d6ecd2b
b2740df50bb
bf71dc61149
fba27a2ea80
92ee7e7f8ec
b28f0d3de23
4beb4ac3918
0ddb6f3dde8
afe301fe892
b8f6402bbbe
This commit is contained in:
Zach Brown
2014-12-07 13:26:30 -06:00
parent 7ae5abba9e
commit 657e0890dc
17 changed files with 16 additions and 32 deletions

View File

@@ -35,10 +35,14 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
// CraftBukkit start
int itemstackAmount = itemstack.count;
-
+ // Spigot start - skip the event if throttled
+ if (!throttled) {
org.bukkit.event.player.PlayerInteractEvent event = CraftEventFactory.callPlayerInteractEvent(this.player, Action.RIGHT_CLICK_AIR, itemstack);
if (event.useItemInHand() != Event.Result.DENY) {
+ if (!throttled) {
// Raytrace to look for 'rogue armswings'
float f1 = this.player.pitch;
float f2 = this.player.yaw;
@@ -0,0 +0,0 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
if (event == null || event.useItemInHand() != Event.Result.DENY) {
this.player.playerInteractManager.useItem(this.player, this.player.world, itemstack);
}
+ }