geforkt von Mirrors/Paper
56 Zeilen
2.6 KiB
Diff
56 Zeilen
2.6 KiB
Diff
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
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/world/entity/EntityInsentient.java b/src/main/java/net/minecraft/world/entity/EntityInsentient.java
|
||
|
index ccdfc8068a8205d6e66ab9458764b1440f8c4b97..2cc15ac22000343dc540454ba971993bf5b2f5a3 100644
|
||
|
--- a/src/main/java/net/minecraft/world/entity/EntityInsentient.java
|
||
|
+++ b/src/main/java/net/minecraft/world/entity/EntityInsentient.java
|
||
|
@@ -607,6 +607,11 @@ public abstract class EntityInsentient extends EntityLiving {
|
||
|
EntityItem entityitem = (EntityItem) iterator.next();
|
||
|
|
||
|
if (!entityitem.dead && !entityitem.getItemStack().isEmpty() && !entityitem.p() && this.i(entityitem.getItemStack())) {
|
||
|
+ // Paper Start
|
||
|
+ if (!entityitem.canMobPickup) {
|
||
|
+ continue;
|
||
|
+ }
|
||
|
+ // Paper End
|
||
|
this.b(entityitem);
|
||
|
}
|
||
|
}
|
||
|
diff --git a/src/main/java/net/minecraft/world/entity/item/EntityItem.java b/src/main/java/net/minecraft/world/entity/item/EntityItem.java
|
||
|
index 38b91b450c6bdc25efaed495ce26d909a52531bf..c486c07a358c0b444e1a1372b6d0fa2901840eac 100644
|
||
|
--- a/src/main/java/net/minecraft/world/entity/item/EntityItem.java
|
||
|
+++ b/src/main/java/net/minecraft/world/entity/item/EntityItem.java
|
||
|
@@ -47,6 +47,7 @@ public class EntityItem extends Entity {
|
||
|
private UUID owner;
|
||
|
public final float b;
|
||
|
private int lastTick = MinecraftServer.currentTick - 1; // CraftBukkit
|
||
|
+ public boolean canMobPickup = true; // Paper
|
||
|
|
||
|
public EntityItem(EntityTypes<? extends EntityItem> entitytypes, World world) {
|
||
|
super(entitytypes, world);
|
||
|
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
|
||
|
index f333dd2726f554a3137a3a78d162905f4ed1435e..5988cdd18b7e4bfca0075fd2356cfe9c4e673954 100644
|
||
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
|
||
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
|
||
|
@@ -49,6 +49,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 void setOwner(UUID uuid) {
|
||
|
item.setOwner(uuid);
|