35 lines
1.5 KiB
Diff
35 lines
1.5 KiB
Diff
|
From 63577ff15d7e0f32eec140953d7dd818b0022c54 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/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java
|
||
|
|
index 95ca1b8e..8820dd32 100644
|
||
|
|
--- a/src/main/java/net/minecraft/server/EntityItem.java
|
||
|
|
+++ b/src/main/java/net/minecraft/server/EntityItem.java
|
||
|
|
@@ -4,6 +4,7 @@ import java.util.Iterator;
|
||
|
|
import javax.annotation.Nullable;
|
||
|
|
import org.apache.logging.log4j.LogManager;
|
||
|
|
import org.apache.logging.log4j.Logger;
|
||
|
|
+import org.bukkit.event.player.PlayerAttemptPickupItemEvent;
|
||
|
|
import org.bukkit.event.player.PlayerPickupItemEvent; // CraftBukkit
|
||
|
|
import com.destroystokyo.paper.HopperPusher; // Paper
|
||
|
|
|
||
|
|
@@ -325,6 +326,12 @@ public class EntityItem extends Entity implements HopperPusher {
|
||
|
|
Item item = itemstack.getItem();
|
||
|
|
int i = itemstack.getCount();
|
||
|
|
|
||
|
|
+ // Paper start
|
||
|
|
+ if (this.pickupDelay <= 0) {
|
||
|
|
+ this.world.getServer().getPluginManager().callEvent(new PlayerAttemptPickupItemEvent((org.bukkit.entity.Player) entityhuman.getBukkitEntity(), (org.bukkit.entity.Item) this.getBukkitEntity()));
|
||
|
|
+ }
|
||
|
|
+ // Paper end
|
||
|
|
+
|
||
|
|
// CraftBukkit start - fire PlayerPickupItemEvent
|
||
|
|
int canHold = entityhuman.inventory.canHold(itemstack);
|
||
|
|
int remaining = i - canHold;
|
||
|
|
--
|
||
|
|
2.11.0
|
||
|
|
|