mirror of
https://hub.spigotmc.org/stash/scm/spigot/spigot.git
synced 2025-09-18 21:33:01 +00:00
44 lines
2 KiB
Diff
44 lines
2 KiB
Diff
From c864ecbae6eccdb7d6ab390ad724480dc3c74144 Mon Sep 17 00:00:00 2001
|
|
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.
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
|
|
index 91ee82ae..a70a4df4 100644
|
|
--- a/src/main/java/net/minecraft/server/WorldServer.java
|
|
+++ b/src/main/java/net/minecraft/server/WorldServer.java
|
|
@@ -989,6 +989,15 @@ public class WorldServer extends World implements GeneratorAccessSeed {
|
|
}
|
|
|
|
public void unloadChunk(Chunk chunk) {
|
|
+ // Spigot Start
|
|
+ for (TileEntity tileentity : chunk.getTileEntities().values()) {
|
|
+ if (tileentity instanceof IInventory) {
|
|
+ for (org.bukkit.entity.HumanEntity h : Lists.newArrayList(((IInventory) tileentity).getViewers())) {
|
|
+ h.closeInventory();
|
|
+ }
|
|
+ }
|
|
+ }
|
|
+ // Spigot End
|
|
this.tileEntityListUnload.addAll(chunk.getTileEntities().values());
|
|
EntitySlice[] aentityslice = chunk.getEntitySlices();
|
|
int i = aentityslice.length;
|
|
@@ -1015,6 +1024,13 @@ public class WorldServer extends World implements GeneratorAccessSeed {
|
|
|
|
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) {
|
|
EntityComplexPart[] aentitycomplexpart = ((EntityEnderDragon) entity).eJ();
|
|
int i = aentitycomplexpart.length;
|
|
--
|
|
2.25.1
|
|
|