mirror of
https://github.com/PaperMC/Paper.git
synced 2025-02-22 04:33:28 +01:00
PlayerAttemptPickupItemEvent additions
This commit is contained in:
parent
f141bae102
commit
222aac9769
2 changed files with 68 additions and 9 deletions
Spigot-API-Patches
Spigot-Server-Patches
|
@ -6,7 +6,7 @@ Subject: [PATCH] PlayerAttemptPickupItemEvent
|
||||||
|
|
||||||
diff --git a/src/main/java/org/bukkit/event/player/PlayerAttemptPickupItemEvent.java b/src/main/java/org/bukkit/event/player/PlayerAttemptPickupItemEvent.java
|
diff --git a/src/main/java/org/bukkit/event/player/PlayerAttemptPickupItemEvent.java b/src/main/java/org/bukkit/event/player/PlayerAttemptPickupItemEvent.java
|
||||||
new file mode 100644
|
new file mode 100644
|
||||||
index 00000000..2f5fdb13
|
index 00000000..480293e9
|
||||||
--- /dev/null
|
--- /dev/null
|
||||||
+++ b/src/main/java/org/bukkit/event/player/PlayerAttemptPickupItemEvent.java
|
+++ b/src/main/java/org/bukkit/event/player/PlayerAttemptPickupItemEvent.java
|
||||||
@@ -0,0 +0,0 @@
|
@@ -0,0 +0,0 @@
|
||||||
|
@ -14,18 +14,28 @@ index 00000000..2f5fdb13
|
||||||
+
|
+
|
||||||
+import org.bukkit.entity.Item;
|
+import org.bukkit.entity.Item;
|
||||||
+import org.bukkit.entity.Player;
|
+import org.bukkit.entity.Player;
|
||||||
|
+import org.bukkit.event.Cancellable;
|
||||||
+import org.bukkit.event.HandlerList;
|
+import org.bukkit.event.HandlerList;
|
||||||
+
|
+
|
||||||
+/**
|
+/**
|
||||||
+ * Thrown when a player attempts to pick an item up from the ground
|
+ * Thrown when a player attempts to pick an item up from the ground
|
||||||
+ */
|
+ */
|
||||||
+public class PlayerAttemptPickupItemEvent extends PlayerEvent {
|
+public class PlayerAttemptPickupItemEvent extends PlayerEvent implements Cancellable {
|
||||||
+ private static final HandlerList handlers = new HandlerList();
|
+ private static final HandlerList handlers = new HandlerList();
|
||||||
+ private final Item item;
|
+ private final Item item;
|
||||||
|
+ private final int remaining;
|
||||||
|
+ private boolean flyAtPlayer = true;
|
||||||
|
+ private boolean isCancelled = false;
|
||||||
+
|
+
|
||||||
|
+ @Deprecated // Remove in 1.13
|
||||||
+ public PlayerAttemptPickupItemEvent(final Player player, final Item item) {
|
+ public PlayerAttemptPickupItemEvent(final Player player, final Item item) {
|
||||||
|
+ this(player, item, 0);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ public PlayerAttemptPickupItemEvent(final Player player, final Item item, final int remaining) {
|
||||||
+ super(player);
|
+ super(player);
|
||||||
+ this.item = item;
|
+ this.item = item;
|
||||||
|
+ this.remaining = remaining;
|
||||||
+ }
|
+ }
|
||||||
+
|
+
|
||||||
+ /**
|
+ /**
|
||||||
|
@ -37,6 +47,45 @@ index 00000000..2f5fdb13
|
||||||
+ return item;
|
+ return item;
|
||||||
+ }
|
+ }
|
||||||
+
|
+
|
||||||
|
+ /**
|
||||||
|
+ * Gets the amount that will remain on the ground, if any
|
||||||
|
+ *
|
||||||
|
+ * @return amount that will remain on the ground
|
||||||
|
+ */
|
||||||
|
+ public int getRemaining() {
|
||||||
|
+ return remaining;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ /**
|
||||||
|
+ * Set if the item will fly at the player
|
||||||
|
+ * <p>Cancelling the event will set this value to false.</p>
|
||||||
|
+ *
|
||||||
|
+ * @param flyAtPlayer True for item to fly at player
|
||||||
|
+ */
|
||||||
|
+ public void setFlyAtPlayer(boolean flyAtPlayer) {
|
||||||
|
+ this.flyAtPlayer = flyAtPlayer;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ /**
|
||||||
|
+ * Gets if the item will fly at the player
|
||||||
|
+ *
|
||||||
|
+ * @return True if the item will fly at the player
|
||||||
|
+ */
|
||||||
|
+ public boolean getFlyAtPlayer() {
|
||||||
|
+ return this.flyAtPlayer;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+
|
||||||
|
+ @Override
|
||||||
|
+ public boolean isCancelled() {
|
||||||
|
+ return this.isCancelled;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ @Override
|
||||||
|
+ public void setCancelled(boolean cancel) {
|
||||||
|
+ this.isCancelled = cancel;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
+ @Override
|
+ @Override
|
||||||
+ public HandlerList getHandlers() {
|
+ public HandlerList getHandlers() {
|
||||||
+ return handlers;
|
+ return handlers;
|
||||||
|
|
|
@ -5,7 +5,7 @@ Subject: [PATCH] PlayerAttemptPickupItemEvent
|
||||||
|
|
||||||
|
|
||||||
diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java
|
diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java
|
||||||
index ae4910b4b..b56d1a35e 100644
|
index ae4910b4..0b7fc327 100644
|
||||||
--- a/src/main/java/net/minecraft/server/EntityItem.java
|
--- a/src/main/java/net/minecraft/server/EntityItem.java
|
||||||
+++ b/src/main/java/net/minecraft/server/EntityItem.java
|
+++ b/src/main/java/net/minecraft/server/EntityItem.java
|
||||||
@@ -0,0 +0,0 @@ import org.apache.logging.log4j.Logger;
|
@@ -0,0 +0,0 @@ import org.apache.logging.log4j.Logger;
|
||||||
|
@ -17,16 +17,26 @@ index ae4910b4b..b56d1a35e 100644
|
||||||
|
|
||||||
// Paper start - implement HopperPusher
|
// Paper start - implement HopperPusher
|
||||||
@@ -0,0 +0,0 @@ public class EntityItem extends Entity implements HopperPusher {
|
@@ -0,0 +0,0 @@ public class EntityItem extends Entity implements HopperPusher {
|
||||||
Item item = itemstack.getItem();
|
int remaining = i - canHold;
|
||||||
int i = itemstack.getCount();
|
boolean flyAtPlayer = false; // Paper
|
||||||
|
|
||||||
+ // Paper start
|
+ // Paper start
|
||||||
+ if (this.pickupDelay <= 0) {
|
+ if (this.pickupDelay <= 0) {
|
||||||
+ this.world.getServer().getPluginManager().callEvent(new PlayerAttemptPickupItemEvent((org.bukkit.entity.Player) entityhuman.getBukkitEntity(), (org.bukkit.entity.Item) this.getBukkitEntity()));
|
+ 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
|
+ // Paper end
|
||||||
+
|
+
|
||||||
// CraftBukkit start - fire PlayerPickupItemEvent
|
if (this.pickupDelay <= 0 && canHold > 0) {
|
||||||
int canHold = entityhuman.inventory.canHold(itemstack);
|
itemstack.setCount(canHold);
|
||||||
int remaining = i - canHold;
|
// Call legacy event
|
||||||
--
|
--
|
Loading…
Add table
Reference in a new issue