[ci-skip] remove accidental duplicate

This commit is contained in:
BillyGalbreath
2022-01-15 03:49:24 -06:00
parent b27699e339
commit 3d6e58ca4a

View File

@@ -5,18 +5,10 @@ Subject: [PATCH] Allow void trading
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
index 172589851c2d9fae2af0a27ea750b02e58f8bc56..c72a82cbd0f12bde60404c01a9e5207fd39a9fe2 100644
index 172589851c2d9fae2af0a27ea750b02e58f8bc56..1ef08117f8249e4eb59b0a10263312e3874b4f0b 100644
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
@@ -1529,6 +1529,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
// so instead we just change the active container and call the event
for (org.bukkit.entity.HumanEntity h : Lists.newArrayList(((net.minecraft.world.Container) tileentity).getViewers())) {
((org.bukkit.craftbukkit.entity.CraftHumanEntity)h).getHandle().closeUnloadedInventory(org.bukkit.event.inventory.InventoryCloseEvent.Reason.UNLOADED); // Paper
+ ((org.bukkit.craftbukkit.entity.CraftHumanEntity)h).getHandle().closeUnloadedInventory(org.bukkit.event.inventory.InventoryCloseEvent.Reason.UNLOADED); // Paper
}
// Paper end
}
@@ -2564,7 +2565,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -2564,7 +2564,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
// Spigot Start
if (entity.getBukkitEntity() instanceof org.bukkit.inventory.InventoryHolder && (!(entity instanceof ServerPlayer) || entity.getRemovalReason() != Entity.RemovalReason.KILLED)) { // SPIGOT-6876: closeInventory clears death message
// Paper start