PaperMC/patches/server/0136-PlayerPickupItemEvent-setFlyAtPlayer.patch

47 lines
2.3 KiB
Diff
Raw Normal View History

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, 7 May 2017 06:26:09 -0500
Subject: [PATCH] PlayerPickupItemEvent#setFlyAtPlayer
diff --git a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
2022-06-07 22:12:48 +02:00
index ab34a42c33a828d610a5732381487a6a1a64f801..c9aa79cd6846ea8b04ad0c77fbf5aff3ce216505 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
2022-06-07 22:12:48 +02:00
@@ -390,6 +390,7 @@ public class ItemEntity extends Entity {
2021-06-11 14:02:28 +02:00
// CraftBukkit start - fire PlayerPickupItemEvent
2021-06-12 12:26:21 +02:00
int canHold = player.getInventory().canHold(itemstack);
2021-06-11 14:02:28 +02:00
int remaining = i - canHold;
+ boolean flyAtPlayer = false; // Paper
if (this.pickupDelay <= 0 && canHold > 0) {
itemstack.setCount(canHold);
2022-06-07 22:12:48 +02:00
@@ -397,8 +398,14 @@ public class ItemEntity extends Entity {
2021-06-11 14:02:28 +02:00
PlayerPickupItemEvent playerEvent = new PlayerPickupItemEvent((org.bukkit.entity.Player) player.getBukkitEntity(), (org.bukkit.entity.Item) this.getBukkitEntity(), remaining);
2021-06-12 12:26:21 +02:00
playerEvent.setCancelled(!playerEvent.getPlayer().getCanPickupItems());
2021-06-11 14:02:28 +02:00
this.level.getCraftServer().getPluginManager().callEvent(playerEvent);
+ flyAtPlayer = playerEvent.getFlyAtPlayer(); // Paper
if (playerEvent.isCancelled()) {
itemstack.setCount(i); // SPIGOT-5294 - restore count
+ // Paper Start
+ if (flyAtPlayer) {
+ player.take(this, i);
+ }
+ // Paper End
return;
}
2022-06-07 22:12:48 +02:00
@@ -428,7 +435,11 @@ public class ItemEntity extends Entity {
2021-06-11 14:02:28 +02:00
// CraftBukkit end
2021-06-12 12:26:21 +02:00
if (this.pickupDelay == 0 && (this.owner == null || this.owner.equals(player.getUUID())) && player.getInventory().add(itemstack)) {
2021-06-11 14:02:28 +02:00
- player.take(this, i);
+ // Paper Start
+ if (flyAtPlayer) {
+ player.take(this, i);
+ }
+ // Paper End
if (itemstack.isEmpty()) {
2021-06-12 12:26:21 +02:00
this.discard();
2021-06-11 14:02:28 +02:00
itemstack.setCount(i);