51 Zeilen
1.7 KiB
Diff
51 Zeilen
1.7 KiB
Diff
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
From: Alfie Smith <alfie@alfiesmith.net>
|
||
|
Date: Sat, 7 Nov 2020 01:20:33 +0000
|
||
|
Subject: [PATCH] Item no age & no player pickup
|
||
|
|
||
|
|
||
|
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
|
||
|
index 9a410f557988d737c3b930a79ef2ccb2b5c8b406..aff17bb3bd22de492b9736d27b7f3e4bdb37134c 100644
|
||
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
|
||
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
|
||
|
@@ -10,6 +10,12 @@ import org.bukkit.entity.Item;
|
||
|
import org.bukkit.inventory.ItemStack;
|
||
|
|
||
|
public class CraftItem extends CraftEntity implements Item {
|
||
|
+
|
||
|
+ // Paper start
|
||
|
+ private final static int NO_AGE_TIME = (int) Short.MIN_VALUE;
|
||
|
+ private final static int NO_PICKUP_TIME = (int) Short.MAX_VALUE;
|
||
|
+ // Paper end
|
||
|
+
|
||
|
private final ItemEntity item;
|
||
|
|
||
|
public CraftItem(CraftServer server, Entity entity, ItemEntity item) {
|
||
|
@@ -57,6 +63,26 @@ public class CraftItem extends CraftEntity implements Item {
|
||
|
public void setCanMobPickup(boolean canMobPickup) {
|
||
|
item.canMobPickup = canMobPickup;
|
||
|
}
|
||
|
+
|
||
|
+ @Override
|
||
|
+ public boolean canPlayerPickup() {
|
||
|
+ return item.pickupDelay != NO_PICKUP_TIME;
|
||
|
+ }
|
||
|
+
|
||
|
+ @Override
|
||
|
+ public void setCanPlayerPickup(boolean canPlayerPickup) {
|
||
|
+ item.pickupDelay = canPlayerPickup ? 0 : NO_PICKUP_TIME;
|
||
|
+ }
|
||
|
+
|
||
|
+ @Override
|
||
|
+ public boolean willAge() {
|
||
|
+ return item.age != NO_AGE_TIME;
|
||
|
+ }
|
||
|
+
|
||
|
+ @Override
|
||
|
+ public void setWillAge(boolean willAge) {
|
||
|
+ item.age = willAge ? 0 : NO_AGE_TIME;
|
||
|
+ }
|
||
|
// Paper End
|
||
|
|
||
|
@Override
|