2020-01-22 03:02:07 +01:00
|
|
|
From f1a23b56cf060e8ca98f48426d7d1bd9f5cc5dae Mon Sep 17 00:00:00 2001
|
2017-06-12 02:40:42 +02: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
|
2020-01-22 03:02:07 +01:00
|
|
|
index f389e5565..5ca281172 100644
|
2017-06-12 02:40:42 +02:00
|
|
|
--- a/src/main/java/net/minecraft/server/EntityInsentient.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/EntityInsentient.java
|
2019-12-12 00:43:22 +01:00
|
|
|
@@ -513,6 +513,11 @@ public abstract class EntityInsentient extends EntityLiving {
|
2017-06-12 02:40:42 +02:00
|
|
|
EntityItem entityitem = (EntityItem) iterator.next();
|
|
|
|
|
2019-12-12 00:43:22 +01:00
|
|
|
if (!entityitem.dead && !entityitem.getItemStack().isEmpty() && !entityitem.p()) {
|
2018-07-18 02:08:13 +02:00
|
|
|
+ // Paper Start
|
|
|
|
+ if (!entityitem.canMobPickup) {
|
|
|
|
+ continue;
|
|
|
|
+ }
|
|
|
|
+ // Paper End
|
2017-06-12 02:40:42 +02:00
|
|
|
this.a(entityitem);
|
|
|
|
}
|
2018-07-18 02:08:13 +02:00
|
|
|
}
|
2017-06-12 02:40:42 +02:00
|
|
|
diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java
|
2020-01-22 03:02:07 +01:00
|
|
|
index f657607a1..9973fc0b1 100644
|
2017-06-12 02:40:42 +02:00
|
|
|
--- a/src/main/java/net/minecraft/server/EntityItem.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/EntityItem.java
|
2019-12-12 00:43:22 +01:00
|
|
|
@@ -20,6 +20,7 @@ public class EntityItem extends Entity {
|
2019-04-27 08:26:04 +02:00
|
|
|
private UUID owner;
|
|
|
|
public final float b;
|
|
|
|
private int lastTick = MinecraftServer.currentTick - 1; // CraftBukkit
|
2017-06-12 02:40:42 +02:00
|
|
|
+ public boolean canMobPickup = true; // Paper
|
2019-04-27 08:26:04 +02:00
|
|
|
|
|
|
|
public EntityItem(EntityTypes<? extends EntityItem> entitytypes, World world) {
|
|
|
|
super(entitytypes, world);
|
2017-06-12 02:40:42 +02:00
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
|
2020-01-22 03:02:07 +01:00
|
|
|
index cc593fbc9..3f552b590 100644
|
2017-06-12 02:40:42 +02:00
|
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
|
|
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
|
2019-05-06 04:58:04 +02:00
|
|
|
@@ -48,6 +48,16 @@ public class CraftItem extends CraftEntity implements Item {
|
2019-01-01 04:15:55 +01:00
|
|
|
item.age = value;
|
2017-06-12 02:40:42 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
+ // Paper Start
|
|
|
|
+ public boolean canMobPickup() {
|
|
|
|
+ return item.canMobPickup;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ public void setCanMobPickup(boolean canMobPickup) {
|
|
|
|
+ item.canMobPickup = canMobPickup;
|
|
|
|
+ }
|
|
|
|
+ // Paper End
|
|
|
|
+
|
|
|
|
@Override
|
|
|
|
public String toString() {
|
|
|
|
return "CraftItem";
|
|
|
|
--
|
2020-01-22 03:02:07 +01:00
|
|
|
2.25.0.windows.1
|
2017-06-12 02:40:42 +02:00
|
|
|
|