PlayerPickupItemEvent#setFlyAtPlayer (#683)

* PlayerPickupItemEvent#setFlyAtPlayer
2017-06-11 19:43:59 -05:00
parent e91f3880b7
commit 899f4969c1
2 changed files with 101 additions and 0 deletions
--- a/Spigot-Server-Patches/PlayerPickupItemEvent-setFlyAtPlayer.patch
+++ b/Spigot-Server-Patches/PlayerPickupItemEvent-setFlyAtPlayer.patch
@@ -0,0 +1,47 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: BillyGalbreath <Blake.Galbreath@GMail.com>
+Date: Sun, 7 May 2017 06:26:09 -0500
+Subject: [PATCH] PlayerPickupItemEvent#setFlyAtPlayer
+
+
+diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java
+index 95ca1b8e..2dd27d1c 100644
+--- a/src/main/java/net/minecraft/server/EntityItem.java
+++ b/src/main/java/net/minecraft/server/EntityItem.java
+@@ -0,0 +0,0 @@ public class EntityItem extends Entity implements HopperPusher {
+             // CraftBukkit start - fire PlayerPickupItemEvent
+             int canHold = entityhuman.inventory.canHold(itemstack);
+             int remaining = i - canHold;
+            boolean flyAtPlayer = false; // Paper
+ 
+             if (this.pickupDelay <= 0 && canHold > 0) {
+                 itemstack.setCount(canHold);
+@@ -0,0 +0,0 @@ public class EntityItem extends Entity implements HopperPusher {
+                 // event.setCancelled(!entityhuman.canPickUpLoot); TODO
+                 this.world.getServer().getPluginManager().callEvent(event);
+                 itemstack.setCount(canHold + remaining);
+                flyAtPlayer = event.getFlyAtPlayer(); // Paper
+ 
+                 if (event.isCancelled()) {
+                    // Paper Start
+                    if (flyAtPlayer) {
+                        entityhuman.receive(this, i);
+                    }
+                    // Paper End
+                     return;
+                 }
+ 
+@@ -0,0 +0,0 @@ public class EntityItem extends Entity implements HopperPusher {
+                     }
+                 }
+ 
+-                entityhuman.receive(this, i);
+                // Paper Start
+                if (flyAtPlayer) {
+                    entityhuman.receive(this, i);
+                }
+                // Paper End
+                 if (itemstack.isEmpty()) {
+                     this.die();
+                     itemstack.setCount(i);
+--