spigot/CraftBukkit-Patches/0020-Properly-Close-Inventories.patch

45 lines
2 KiB
Diff
Raw Normal View History

2021-04-07 15:03:34 +10:00
From 971075cb4449acd90636f0e9d4532268c284b99d Mon Sep 17 00:00:00 2001
2014-04-12 14:18:37 +10:00
From: md_5 <md_5@live.com.au>
Date: Thu, 27 Jun 2013 17:26:09 +1000
Subject: [PATCH] Properly Close Inventories
Properly close inventories when unloading and switching worlds.
2021-03-16 09:00:00 +11:00
diff --git a/src/main/java/net/minecraft/server/level/WorldServer.java b/src/main/java/net/minecraft/server/level/WorldServer.java
2021-04-07 15:03:34 +10:00
index df514ebd3..82312527b 100644
2021-03-16 09:00:00 +11:00
--- a/src/main/java/net/minecraft/server/level/WorldServer.java
+++ b/src/main/java/net/minecraft/server/level/WorldServer.java
2021-04-07 15:03:34 +10:00
@@ -1100,6 +1100,15 @@ public class WorldServer extends World implements GeneratorAccessSeed {
2019-04-23 12:00:00 +10:00
}
2014-04-12 14:18:37 +10:00
2019-04-23 12:00:00 +10:00
public void unloadChunk(Chunk chunk) {
+ // Spigot Start
2020-05-09 19:41:03 +10:00
+ for (TileEntity tileentity : chunk.getTileEntities().values()) {
2021-03-16 09:00:00 +11:00
+ if (tileentity instanceof net.minecraft.world.IInventory) {
+ for (org.bukkit.entity.HumanEntity h : Lists.newArrayList(((net.minecraft.world.IInventory) tileentity).getViewers())) {
2020-05-09 19:41:03 +10:00
+ h.closeInventory();
2014-04-12 14:18:37 +10:00
+ }
+ }
2019-04-23 12:00:00 +10:00
+ }
+ // Spigot End
this.tileEntityListUnload.addAll(chunk.getTileEntities().values());
EntitySlice[] aentityslice = chunk.getEntitySlices();
int i = aentityslice.length;
2021-04-07 15:03:34 +10:00
@@ -1126,6 +1135,13 @@ public class WorldServer extends World implements GeneratorAccessSeed {
2014-04-12 14:18:37 +10:00
2020-05-09 19:41:03 +10:00
public void unregisterEntity(Entity entity) {
org.spigotmc.AsyncCatcher.catchOp("entity unregister"); // Spigot
+ // Spigot Start
+ if (entity.getBukkitEntity() instanceof org.bukkit.inventory.InventoryHolder) {
+ for (org.bukkit.entity.HumanEntity h : Lists.newArrayList(((org.bukkit.inventory.InventoryHolder) entity.getBukkitEntity()).getInventory().getViewers())) {
+ h.closeInventory();
+ }
+ }
+ // Spigot End
if (entity instanceof EntityEnderDragon) {
2020-08-12 07:00:00 +10:00
EntityComplexPart[] aentitycomplexpart = ((EntityEnderDragon) entity).eJ();
2020-05-09 19:41:03 +10:00
int i = aentitycomplexpart.length;
2014-04-12 14:18:37 +10:00
--
2.25.1
2014-04-12 14:18:37 +10:00