2018-08-31 22:56:57 +00:00
|
|
|
From b076d81196c1378797a0d37d050d0fc193590b82 Mon Sep 17 00:00:00 2001
|
2017-06-12 00:40:42 +00:00
|
|
|
From: BillyGalbreath <Blake.Galbreath@GMail.com>
|
|
|
|
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
|
2018-08-31 22:56:57 +00:00
|
|
|
index 6f5f3f8cd0..04a1218ed9 100644
|
2017-06-12 00:40:42 +00:00
|
|
|
--- a/src/main/java/net/minecraft/server/EntityInsentient.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/EntityInsentient.java
|
2018-08-31 22:56:57 +00:00
|
|
|
@@ -518,6 +518,11 @@ public abstract class EntityInsentient extends EntityLiving {
|
2017-06-12 00:40:42 +00:00
|
|
|
EntityItem entityitem = (EntityItem) iterator.next();
|
|
|
|
|
2018-07-18 00:08:13 +00:00
|
|
|
if (!entityitem.dead && !entityitem.getItemStack().isEmpty() && !entityitem.q()) {
|
|
|
|
+ // Paper Start
|
|
|
|
+ if (!entityitem.canMobPickup) {
|
|
|
|
+ continue;
|
|
|
|
+ }
|
|
|
|
+ // Paper End
|
2017-06-12 00:40:42 +00:00
|
|
|
this.a(entityitem);
|
|
|
|
}
|
2018-07-18 00:08:13 +00:00
|
|
|
}
|
2017-06-12 00:40:42 +00:00
|
|
|
diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java
|
2018-08-26 18:11:49 +00:00
|
|
|
index eecebafdad..3e70a06397 100644
|
2017-06-12 00:40:42 +00:00
|
|
|
--- a/src/main/java/net/minecraft/server/EntityItem.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/EntityItem.java
|
2018-07-18 00:08:13 +00:00
|
|
|
@@ -13,6 +13,7 @@ public class EntityItem extends Entity {
|
|
|
|
private static final DataWatcherObject<ItemStack> b = DataWatcher.a(EntityItem.class, DataWatcherRegistry.g);
|
2017-06-12 00:40:42 +00:00
|
|
|
private int age;
|
|
|
|
public int pickupDelay;
|
|
|
|
+ public boolean canMobPickup = true; // Paper
|
2018-07-18 00:08:13 +00:00
|
|
|
private int e;
|
|
|
|
private UUID f;
|
|
|
|
private UUID g;
|
2017-06-12 00:40:42 +00:00
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
|
2018-07-23 08:39:55 +00:00
|
|
|
index a17a537d69..1df17f09bb 100644
|
2017-06-12 00:40:42 +00:00
|
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
|
|
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
|
|
|
|
@@ -37,6 +37,16 @@ public class CraftItem extends CraftEntity implements Item {
|
|
|
|
item.pickupDelay = Math.min(delay, Short.MAX_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";
|
|
|
|
--
|
2018-07-04 07:55:24 +00:00
|
|
|
2.18.0
|
2017-06-12 00:40:42 +00:00
|
|
|
|