2021-06-11 14:02:28 +02:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
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/world/entity/item/ItemEntity.java b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
|
2024-06-13 20:09:28 +02:00
|
|
|
index f51f04758e135294bab5c7d1f891a8d67fea78f5..f9dfd6e7b610cfee75524a525ab0e72bed5522da 100644
|
2021-06-11 14:02:28 +02:00
|
|
|
--- a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
|
|
|
|
+++ b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
|
2024-06-13 20:09:28 +02:00
|
|
|
@@ -40,6 +40,7 @@ import org.bukkit.event.entity.EntityPickupItemEvent;
|
Updated Upstream (Bukkit/CraftBukkit/Spigot) (#10277)
Upstream has released updates that appear to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing
Bukkit Changes:
9a80d38c SPIGOT-336, SPIGOT-3366, SPIGOT-5768, SPIGOT-6409, SPIGOT-6861, PR-722: Add EntityRemoveEvent
258086d9 SPIGOT-7417, PR-967: Add Sign#getTargetSide and Sign#getAllowedEditor
ffaba051 SPIGOT-7584: Add missing Tag.ITEMS_NON_FLAMMABLE_WOOD
CraftBukkit Changes:
98b6c1ac7 SPIGOT-7589 Fix NullPointerException when bans expire
a2736ddb0 SPIGOT-336, SPIGOT-3366, SPIGOT-5768, SPIGOT-6409, SPIGOT-6861, PR-1008: Add EntityRemoveEvent
5bf12cb89 SPIGOT-7565: Throw a more descriptive error message when a developer tries to spawn an entity from a CraftBukkit class
76d95fe7e SPIGOT-7417, PR-1343: Add Sign#getTargetSide and Sign#getAllowedEditor
Spigot Changes:
e9ec5485 Rebuild patches
f1b62e0c Rebuild patches
2024-02-23 14:37:33 +01:00
|
|
|
import org.bukkit.event.entity.EntityRemoveEvent;
|
2021-06-11 14:02:28 +02:00
|
|
|
import org.bukkit.event.player.PlayerPickupItemEvent;
|
|
|
|
// CraftBukkit end
|
|
|
|
+import org.bukkit.event.player.PlayerAttemptPickupItemEvent; // Paper
|
|
|
|
|
2023-03-14 19:36:39 +01:00
|
|
|
public class ItemEntity extends Entity implements TraceableEntity {
|
2021-06-11 14:02:28 +02:00
|
|
|
|
2024-06-13 20:09:28 +02:00
|
|
|
@@ -438,6 +439,22 @@ public class ItemEntity extends Entity implements TraceableEntity {
|
2021-06-11 14:02:28 +02:00
|
|
|
int remaining = i - canHold;
|
|
|
|
boolean flyAtPlayer = false; // Paper
|
|
|
|
|
2024-01-22 19:01:10 +01:00
|
|
|
+ // Paper start - PlayerAttemptPickupItemEvent
|
2021-06-11 14:02:28 +02:00
|
|
|
+ if (this.pickupDelay <= 0) {
|
|
|
|
+ PlayerAttemptPickupItemEvent attemptEvent = new PlayerAttemptPickupItemEvent((org.bukkit.entity.Player) player.getBukkitEntity(), (org.bukkit.entity.Item) this.getBukkitEntity(), remaining);
|
2023-06-08 00:12:41 +02:00
|
|
|
+ this.level().getCraftServer().getPluginManager().callEvent(attemptEvent);
|
2021-06-11 14:02:28 +02:00
|
|
|
+
|
|
|
|
+ flyAtPlayer = attemptEvent.getFlyAtPlayer();
|
|
|
|
+ if (attemptEvent.isCancelled()) {
|
|
|
|
+ if (flyAtPlayer) {
|
|
|
|
+ player.take(this, i);
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ return;
|
|
|
|
+ }
|
|
|
|
+ }
|
2024-01-22 19:01:10 +01:00
|
|
|
+ // Paper end - PlayerAttemptPickupItemEvent
|
2021-06-11 14:02:28 +02:00
|
|
|
+
|
|
|
|
if (this.pickupDelay <= 0 && canHold > 0) {
|
|
|
|
itemstack.setCount(canHold);
|
|
|
|
// Call legacy event
|