Paper/Spigot-Server-Patches/0183-PlayerAttemptPickupItemEvent.patch

45 lines
1.7 KiB
Diff
Raw Normal View History

From 9c188947d2debdea36e4796d455b317400fb7bd3 Mon Sep 17 00:00:00 2001
2017-06-12 02:46:11 +02:00
From: BillyGalbreath <Blake.Galbreath@GMail.com>
Date: Sun, 11 Jun 2017 16:30:30 -0500
Subject: [PATCH] PlayerAttemptPickupItemEvent
diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java
index d9d52a63d8..946e59753e 100644
2017-06-12 02:46:11 +02:00
--- a/src/main/java/net/minecraft/server/EntityItem.java
+++ b/src/main/java/net/minecraft/server/EntityItem.java
@@ -7,6 +7,7 @@ import javax.annotation.Nullable;
2017-07-28 15:45:16 +02:00
import org.bukkit.event.entity.EntityPickupItemEvent;
import org.bukkit.event.player.PlayerPickupItemEvent;
// CraftBukkit end
+import org.bukkit.event.player.PlayerAttemptPickupItemEvent; // Paper
2017-06-12 02:46:11 +02:00
public class EntityItem extends Entity {
@@ -310,6 +311,22 @@ public class EntityItem extends Entity {
2017-11-11 04:49:53 +01:00
int remaining = i - canHold;
boolean flyAtPlayer = false; // Paper
2017-06-12 02:46:11 +02:00
+ // Paper start
+ if (this.pickupDelay <= 0) {
2017-11-11 04:49:53 +01:00
+ PlayerAttemptPickupItemEvent attemptEvent = new PlayerAttemptPickupItemEvent((org.bukkit.entity.Player) entityhuman.getBukkitEntity(), (org.bukkit.entity.Item) this.getBukkitEntity(), remaining);
+ this.world.getServer().getPluginManager().callEvent(attemptEvent);
+
+ flyAtPlayer = attemptEvent.getFlyAtPlayer();
+ if (attemptEvent.isCancelled()) {
+ if (flyAtPlayer) {
+ entityhuman.receive(this, i);
+ }
+
+ return;
+ }
2017-06-12 02:46:11 +02:00
+ }
+ // Paper end
+
2017-11-11 04:49:53 +01:00
if (this.pickupDelay <= 0 && canHold > 0) {
itemstack.setCount(canHold);
// Call legacy event
2017-06-12 02:46:11 +02:00
--
2.19.0
2017-06-12 02:46:11 +02:00