64 Zeilen
3.5 KiB
Diff
64 Zeilen
3.5 KiB
Diff
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
|
From: kickash32 <kickash32@gmail.com>
|
||
|
|
Date: Mon, 3 Jun 2019 02:02:39 -0400
|
||
|
|
Subject: [PATCH] Implement alternative item-despawn-rate
|
||
|
|
|
||
|
|
Co-authored-by: Noah van der Aa <ndvdaa@gmail.com>
|
||
|
|
|
||
|
|
diff --git a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
|
||
|
|
index 85fc33183ff01611bfa90ddd33a9c885d1dd7172..22437b835c309956f263278db37737251e1503d5 100644
|
||
|
|
--- a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
|
||
|
|
+++ b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
|
||
|
|
@@ -54,6 +54,7 @@ public class ItemEntity extends Entity {
|
||
|
|
public final float bobOffs;
|
||
|
|
private int lastTick = MinecraftServer.currentTick - 1; // CraftBukkit
|
||
|
|
public boolean canMobPickup = true; // Paper
|
||
|
|
+ private int despawnRate = -1; // Paper
|
||
|
|
|
||
|
|
public ItemEntity(EntityType<? extends ItemEntity> type, Level world) {
|
||
|
|
super(type, world);
|
||
|
|
@@ -184,7 +185,7 @@ public class ItemEntity extends Entity {
|
||
|
|
}
|
||
|
|
}
|
||
|
|
|
||
|
|
- if (!this.level.isClientSide && this.age >= level.spigotConfig.itemDespawnRate) { // Spigot
|
||
|
|
+ if (!this.level.isClientSide && this.age >= this.despawnRate) { // Spigot // Paper
|
||
|
|
// CraftBukkit start - fire ItemDespawnEvent
|
||
|
|
if (org.bukkit.craftbukkit.event.CraftEventFactory.callItemDespawnEvent(this).isCancelled()) {
|
||
|
|
this.age = 0;
|
||
|
|
@@ -208,7 +209,7 @@ public class ItemEntity extends Entity {
|
||
|
|
this.lastTick = MinecraftServer.currentTick;
|
||
|
|
// CraftBukkit end
|
||
|
|
|
||
|
|
- if (!this.level.isClientSide && this.age >= level.spigotConfig.itemDespawnRate) { // Spigot
|
||
|
|
+ if (!this.level.isClientSide && this.age >= this.despawnRate) { // Spigot // Paper
|
||
|
|
// CraftBukkit start - fire ItemDespawnEvent
|
||
|
|
if (org.bukkit.craftbukkit.event.CraftEventFactory.callItemDespawnEvent(this).isCancelled()) {
|
||
|
|
this.age = 0;
|
||
|
|
@@ -263,7 +264,7 @@ public class ItemEntity extends Entity {
|
||
|
|
private boolean isMergable() {
|
||
|
|
ItemStack itemstack = this.getItem();
|
||
|
|
|
||
|
|
- return this.isAlive() && this.pickupDelay != 32767 && this.age != -32768 && this.age < 6000 && itemstack.getCount() < itemstack.getMaxStackSize();
|
||
|
|
+ return this.isAlive() && this.pickupDelay != 32767 && this.age != -32768 && this.age < this.despawnRate && itemstack.getCount() < itemstack.getMaxStackSize(); // Paper - respect despawn rate in pickup check.
|
||
|
|
}
|
||
|
|
|
||
|
|
private void tryToMerge(ItemEntity other) {
|
||
|
|
@@ -507,6 +508,7 @@ public class ItemEntity extends Entity {
|
||
|
|
com.google.common.base.Preconditions.checkArgument(!stack.isEmpty(), "Cannot drop air"); // CraftBukkit
|
||
|
|
this.getEntityData().set(ItemEntity.DATA_ITEM, stack);
|
||
|
|
this.getEntityData().markDirty(ItemEntity.DATA_ITEM); // CraftBukkit - SPIGOT-4591, must mark dirty
|
||
|
|
+ this.despawnRate = level.paperConfig().entities.spawning.altItemDespawnRate.enabled ? level.paperConfig().entities.spawning.altItemDespawnRate.items.getOrDefault(stack.getItem(), level.spigotConfig.itemDespawnRate) : level.spigotConfig.itemDespawnRate; // Paper
|
||
|
|
}
|
||
|
|
|
||
|
|
@Override
|
||
|
|
@@ -570,7 +572,7 @@ public class ItemEntity extends Entity {
|
||
|
|
|
||
|
|
public void makeFakeItem() {
|
||
|
|
this.setNeverPickUp();
|
||
|
|
- this.age = level.spigotConfig.itemDespawnRate - 1; // Spigot
|
||
|
|
+ this.age = this.despawnRate - 1; // Spigot
|
||
|
|
}
|
||
|
|
|
||
|
|
public float getSpin(float tickDelta) {
|