Upstream/Minestom
1
0
Fork 0
mirror of https://github.com/Minestom/Minestom.git synced 2025-02-08 00:11:34 +01:00
Code Issues Projects Releases Wiki Activity

Allow ItemEntity#getMergeUpdateOption to be null

Browse Source
This commit is contained in:
Felix Cravic 2020-06-01 02:18:24 +02:00
parent 7e20278dd9
commit b1e86adb23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/net/minestom/server/entity/ItemEntity.java
View File

@ -62,7 +62,7 @@ public class ItemEntity extends ObjectEntity {
@Override
public void update(long time) {
if (isMergeable() && isPickable() &&
(mergeUpdateOption != null && !CooldownUtils.hasCooldown(time, lastMergeCheck, mergeUpdateOption))) {
(mergeUpdateOption == null || !CooldownUtils.hasCooldown(time, lastMergeCheck, mergeUpdateOption))) {
this.lastMergeCheck = time;
Chunk chunk = instance.getChunkAt(getPosition());