From 3093b81fee3064603c368ab934eddf66ce304433 Mon Sep 17 00:00:00 2001 From: Kyle Wood Date: Sat, 24 Apr 2021 17:01:33 -0500 Subject: Move patches --- .../0150-PlayerAttemptPickupItemEvent.patch | 41 ++++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 Spigot-Server-Patches-Unmapped/0150-PlayerAttemptPickupItemEvent.patch (limited to 'Spigot-Server-Patches-Unmapped/0150-PlayerAttemptPickupItemEvent.patch') diff --git a/Spigot-Server-Patches-Unmapped/0150-PlayerAttemptPickupItemEvent.patch b/Spigot-Server-Patches-Unmapped/0150-PlayerAttemptPickupItemEvent.patch new file mode 100644 index 0000000000..13d2f54354 --- /dev/null +++ b/Spigot-Server-Patches-Unmapped/0150-PlayerAttemptPickupItemEvent.patch @@ -0,0 +1,41 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: BillyGalbreath +Date: Sun, 11 Jun 2017 16:30:30 -0500 +Subject: [PATCH] PlayerAttemptPickupItemEvent + + +diff --git a/src/main/java/net/minecraft/world/entity/item/EntityItem.java b/src/main/java/net/minecraft/world/entity/item/EntityItem.java +index 3b72032f6f4f4bd64d1202658cc0c6ee4fb76ea9..de11fd9772f30ac72c3ca52ec4efc3fef4091425 100644 +--- a/src/main/java/net/minecraft/world/entity/item/EntityItem.java ++++ b/src/main/java/net/minecraft/world/entity/item/EntityItem.java +@@ -36,6 +36,7 @@ import net.minecraft.server.MinecraftServer; + import org.bukkit.event.entity.EntityPickupItemEvent; + import org.bukkit.event.player.PlayerPickupItemEvent; + // CraftBukkit end ++import org.bukkit.event.player.PlayerAttemptPickupItemEvent; // Paper + + public class EntityItem extends Entity { + +@@ -365,6 +366,22 @@ public class EntityItem extends Entity { + int remaining = i - canHold; + boolean flyAtPlayer = false; // Paper + ++ // Paper start ++ if (this.pickupDelay <= 0) { ++ 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; ++ } ++ } ++ // Paper end ++ + if (this.pickupDelay <= 0 && canHold > 0) { + itemstack.setCount(canHold); + // Call legacy event -- cgit v1.2.3