aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/0143-Item-canEntityPickup.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/server/0143-Item-canEntityPickup.patch')
-rw-r--r--patches/server/0143-Item-canEntityPickup.patch57
1 files changed, 57 insertions, 0 deletions
diff --git a/patches/server/0143-Item-canEntityPickup.patch b/patches/server/0143-Item-canEntityPickup.patch
new file mode 100644
index 0000000000..38236cc42a
--- /dev/null
+++ b/patches/server/0143-Item-canEntityPickup.patch
@@ -0,0 +1,57 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: BillyGalbreath <[email protected]>
+Date: Fri, 5 May 2017 03:57:17 -0500
+Subject: [PATCH] Item#canEntityPickup
+
+
+diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
+index c09f1ac470c4055897f8d6c6201bd8dc421cdbfe..049a9c4547428d7306d82ed35bcd470ae6f3efc3 100644
+--- a/src/main/java/net/minecraft/world/entity/Mob.java
++++ b/src/main/java/net/minecraft/world/entity/Mob.java
+@@ -629,6 +629,11 @@ public abstract class Mob extends LivingEntity {
+ ItemEntity entityitem = (ItemEntity) iterator.next();
+
+ if (!entityitem.isRemoved() && !entityitem.getItem().isEmpty() && !entityitem.hasPickUpDelay() && this.wantsToPickUp(entityitem.getItem())) {
++ // Paper Start
++ if (!entityitem.canMobPickup) {
++ continue;
++ }
++ // Paper End
+ this.pickUpItem(entityitem);
+ }
+ }
+diff --git a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
+index a938d75e229ce77973182c9dd25c995a16ef17f6..581725ab12f6bea1216dbf62d5cf3923d4340844 100644
+--- a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
++++ b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
+@@ -52,6 +52,7 @@ public class ItemEntity extends Entity {
+ private UUID owner;
+ public final float bobOffs;
+ private int lastTick = MinecraftServer.currentTick - 1; // CraftBukkit
++ public boolean canMobPickup = true; // Paper
+
+ public ItemEntity(EntityType<? extends ItemEntity> type, Level world) {
+ super(type, world);
+diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
+index 4ca76a7530f8679567d887cdf1491d110e7465ec..30c954efba587d69ff55df509339f03e7d5a476e 100644
+--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
++++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
+@@ -66,6 +66,18 @@ public class CraftItem extends CraftEntity implements Item {
+ }
+ }
+
++ // Paper Start
++ @Override
++ public boolean canMobPickup() {
++ return item.canMobPickup;
++ }
++
++ @Override
++ public void setCanMobPickup(boolean canMobPickup) {
++ item.canMobPickup = canMobPickup;
++ }
++ // Paper End
++
+ @Override
+ public void setOwner(UUID uuid) {
+ this.item.setOwner(uuid);