aboutsummaryrefslogtreecommitdiffhomepage
path: root/Spigot-Server-Patches/0178-Item-canEntityPickup.patch
diff options
context:
space:
mode:
Diffstat (limited to 'Spigot-Server-Patches/0178-Item-canEntityPickup.patch')
-rw-r--r--Spigot-Server-Patches/0178-Item-canEntityPickup.patch58
1 files changed, 58 insertions, 0 deletions
diff --git a/Spigot-Server-Patches/0178-Item-canEntityPickup.patch b/Spigot-Server-Patches/0178-Item-canEntityPickup.patch
new file mode 100644
index 0000000000..032db69848
--- /dev/null
+++ b/Spigot-Server-Patches/0178-Item-canEntityPickup.patch
@@ -0,0 +1,58 @@
+From 1853596fcd97ca2e82211602010b3c14e08ffbf7 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/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
+index c530824596..98e214cdd6 100644
+--- a/src/main/java/net/minecraft/server/EntityInsentient.java
++++ b/src/main/java/net/minecraft/server/EntityInsentient.java
+@@ -530,6 +530,11 @@ public abstract class EntityInsentient extends EntityLiving {
+ EntityItem entityitem = (EntityItem) iterator.next();
+
+ if (!entityitem.dead && !entityitem.getItemStack().isEmpty() && !entityitem.q()) {
++ // Paper Start
++ if (!entityitem.canMobPickup) {
++ continue;
++ }
++ // Paper End
+ this.a(entityitem);
+ }
+ }
+diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java
+index 9b854d64fb..39a804b7cb 100644
+--- a/src/main/java/net/minecraft/server/EntityItem.java
++++ b/src/main/java/net/minecraft/server/EntityItem.java
+@@ -13,6 +13,7 @@ public class EntityItem extends Entity {
+ private static final DataWatcherObject<ItemStack> b = DataWatcher.a(EntityItem.class, DataWatcherRegistry.g);
+ public int age; // PAIL
+ public int pickupDelay;
++ public boolean canMobPickup = true; // Paper
+ private int e;
+ private UUID f;
+ private UUID g;
+diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
+index 55d6bacf77..6036592f76 100644
+--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
++++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
+@@ -45,6 +45,16 @@ public class CraftItem extends CraftEntity implements Item {
+ item.age = value;
+ }
+
++ // Paper Start
++ public boolean canMobPickup() {
++ return item.canMobPickup;
++ }
++
++ public void setCanMobPickup(boolean canMobPickup) {
++ item.canMobPickup = canMobPickup;
++ }
++ // Paper End
++
+ @Override
+ public String toString() {
+ return "CraftItem";
+--
+2.21.0
+