2020-05-06 11:48:49 +02:00
|
|
|
From 0000000000000000000000000000000000000000 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
|
2021-02-16 18:08:29 +01:00
|
|
|
index a819fc46bebc4b1aaae63f822087574e976e2ab8..6274cf1975270fdac8ae4986e1c170bd075d640e 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
|
2020-06-25 15:11:48 +02:00
|
|
|
@@ -539,6 +539,11 @@ public abstract class EntityInsentient extends EntityLiving {
|
2017-06-12 02:40:42 +02:00
|
|
|
EntityItem entityitem = (EntityItem) iterator.next();
|
|
|
|
|
2020-06-25 15:11:48 +02:00
|
|
|
if (!entityitem.dead && !entityitem.getItemStack().isEmpty() && !entityitem.p() && this.i(entityitem.getItemStack())) {
|
2018-07-18 02:08:13 +02:00
|
|
|
+ // Paper Start
|
|
|
|
+ if (!entityitem.canMobPickup) {
|
|
|
|
+ continue;
|
|
|
|
+ }
|
|
|
|
+ // Paper End
|
2020-06-25 15:11:48 +02:00
|
|
|
this.b(entityitem);
|
2017-06-12 02:40:42 +02:00
|
|
|
}
|
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
|
2021-03-09 00:12:31 +01:00
|
|
|
index bbaba67d297c3d6a488bdbf6c500658e872772b0..9b400c1f4ea807149862d30154df9b30895176da 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
|
2021-03-09 00:12:31 +01:00
|
|
|
@@ -21,6 +21,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-10-14 16:00:43 +02:00
|
|
|
index d7da0cf2e7b9e669635b469f87e8da4d7fdecb35..d6a64e4ecf9225f9a93523c50b2f1375296b406e 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
|
2020-10-14 16:00:43 +02:00
|
|
|
@@ -49,6 +49,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
|
2020-10-14 16:00:43 +02:00
|
|
|
public void setOwner(UUID uuid) {
|
|
|
|
item.setOwner(uuid);
|