29 lines
1.1 KiB
Diff
29 lines
1.1 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Luna <lunahatesgogle@gmail.com>
|
|
Date: Sun, 13 Mar 2022 14:38:38 -0300
|
|
Subject: [PATCH] ItemEntity - Check if items are air before calling setItem
|
|
|
|
|
|
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 d47b3ac633e7936d30abfda6fc46c2c7412d76fe..1b4d21b5960ef09bada7c707fc5ba4e5cc39630c 100644
|
|
--- a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
|
|
+++ b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
|
|
@@ -416,11 +416,15 @@ public class ItemEntity extends Entity implements TraceableEntity {
|
|
|
|
CompoundTag nbttagcompound1 = nbt.getCompound("Item");
|
|
|
|
- this.setItem(ItemStack.of(nbttagcompound1));
|
|
- if (this.getItem().isEmpty()) {
|
|
+ // Scissors start
|
|
+ ItemStack item = ItemStack.of(nbttagcompound1);
|
|
+ if (item.isEmpty()) {
|
|
this.discard();
|
|
+ return;
|
|
}
|
|
|
|
+ this.setItem(item);
|
|
+ // Scissors end
|
|
}
|
|
|
|
@Override
|