Scissors/patches/removed/server/0008-ItemEntity-Check-if-items-are-air-before-calling-set.patch

29 lines
1.1 KiB
Diff
Raw Normal View History

2022-07-28 03:57:50 +00:00
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
2023-07-06 21:13:45 +00:00
index 52196431a6538872755344859a0454a0e50c3b6e..2312881cdd925ec538fff3df7cdc7e04770453eb 100644
2022-07-28 03:57:50 +00:00
--- a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
+++ b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
2023-07-06 21:13:45 +00:00
@@ -425,11 +425,15 @@ public class ItemEntity extends Entity implements TraceableEntity {
2022-07-28 03:57:50 +00:00
CompoundTag nbttagcompound1 = nbt.getCompound("Item");
- this.setItem(ItemStack.of(nbttagcompound1));
2023-02-25 17:37:46 +00:00
- if (this.getItem().isEmpty()) {
2022-07-28 03:57:50 +00:00
+ // Scissors start
2023-02-25 17:37:46 +00:00
+ ItemStack item = ItemStack.of(nbttagcompound1);
+ if (item.isEmpty()) {
2022-07-28 03:57:50 +00:00
this.discard();
+ return;
}
2023-02-25 17:37:46 +00:00
+ this.setItem(item);
2022-07-28 03:57:50 +00:00
+ // Scissors end
}
@Override