42 lines
1.8 KiB
Diff
42 lines
1.8 KiB
Diff
|
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/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
|