2019-03-20 02:46:00 +01:00
|
|
|
From d2dc3091b8657b318b2813a1e3ab7a1eed394ae8 Mon Sep 17 00:00:00 2001
|
2017-06-12 02:43:59 +02:00
|
|
|
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/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java
|
2019-03-20 02:46:00 +01:00
|
|
|
index 39a804b7c..643793d55 100644
|
2017-06-12 02:43:59 +02:00
|
|
|
--- a/src/main/java/net/minecraft/server/EntityItem.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/EntityItem.java
|
2018-07-18 02:08:13 +02:00
|
|
|
@@ -308,6 +308,7 @@ public class EntityItem extends Entity {
|
2017-06-12 02:43:59 +02:00
|
|
|
// CraftBukkit start - fire PlayerPickupItemEvent
|
|
|
|
int canHold = entityhuman.inventory.canHold(itemstack);
|
|
|
|
int remaining = i - canHold;
|
|
|
|
+ boolean flyAtPlayer = false; // Paper
|
|
|
|
|
|
|
|
if (this.pickupDelay <= 0 && canHold > 0) {
|
|
|
|
itemstack.setCount(canHold);
|
2018-07-18 02:08:13 +02:00
|
|
|
@@ -315,7 +316,13 @@ public class EntityItem extends Entity {
|
2017-07-28 15:45:16 +02:00
|
|
|
PlayerPickupItemEvent playerEvent = new PlayerPickupItemEvent((org.bukkit.entity.Player) entityhuman.getBukkitEntity(), (org.bukkit.entity.Item) this.getBukkitEntity(), remaining);
|
|
|
|
playerEvent.setCancelled(!entityhuman.canPickUpLoot);
|
|
|
|
this.world.getServer().getPluginManager().callEvent(playerEvent);
|
|
|
|
+ flyAtPlayer = playerEvent.getFlyAtPlayer(); // Paper
|
|
|
|
if (playerEvent.isCancelled()) {
|
2017-06-12 02:43:59 +02:00
|
|
|
+ // Paper Start
|
|
|
|
+ if (flyAtPlayer) {
|
|
|
|
+ entityhuman.receive(this, i);
|
|
|
|
+ }
|
|
|
|
+ // Paper End
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2018-07-18 02:08:13 +02:00
|
|
|
@@ -336,6 +343,11 @@ public class EntityItem extends Entity {
|
2017-06-12 02:43:59 +02:00
|
|
|
|
2018-07-18 02:08:13 +02:00
|
|
|
if (this.pickupDelay == 0 && (this.g == null || 6000 - this.age <= 200 || this.g.equals(entityhuman.getUniqueID())) && entityhuman.inventory.pickup(itemstack)) {
|
|
|
|
entityhuman.receive(this, i);
|
2017-06-12 02:43:59 +02:00
|
|
|
+ // Paper Start
|
|
|
|
+ if (flyAtPlayer) {
|
|
|
|
+ entityhuman.receive(this, i);
|
|
|
|
+ }
|
|
|
|
+ // Paper End
|
|
|
|
if (itemstack.isEmpty()) {
|
|
|
|
this.die();
|
|
|
|
itemstack.setCount(i);
|
|
|
|
--
|
2019-03-20 02:46:00 +01:00
|
|
|
2.21.0
|
2017-06-12 02:43:59 +02:00
|
|
|
|