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

53 lines
2.3 KiB
Diff
Raw Normal View History

2019-04-23 09:33:25 +10:00
From 2024b1fad704860b224262d699ae377082ad01e7 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.
diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
2019-04-23 09:33:25 +10:00
index 3751aa0a..dc6dfcaf 100644
2014-04-12 14:18:37 +10:00
--- a/src/main/java/net/minecraft/server/Chunk.java
+++ b/src/main/java/net/minecraft/server/Chunk.java
2018-12-26 08:00:00 +11:00
@@ -847,6 +847,18 @@ public class Chunk implements IChunkAccess {
2014-04-12 14:18:37 +10:00
while (iterator.hasNext()) {
TileEntity tileentity = (TileEntity) iterator.next();
+ // Spigot Start
+ if ( tileentity instanceof IInventory )
+ {
+ for ( org.bukkit.entity.HumanEntity h : Lists.<org.bukkit.entity.HumanEntity>newArrayList((List<org.bukkit.entity.HumanEntity>) ( (IInventory) tileentity ).getViewers() ) )
2014-04-12 14:18:37 +10:00
+ {
+ if ( h instanceof org.bukkit.craftbukkit.entity.CraftHumanEntity )
+ {
+ ( (org.bukkit.craftbukkit.entity.CraftHumanEntity) h).getHandle().closeInventory();
+ }
2014-04-12 14:18:37 +10:00
+ }
+ }
+ // Spigot End
this.world.b(tileentity);
2014-04-12 14:18:37 +10:00
}
2018-12-26 08:00:00 +11:00
@@ -860,6 +872,18 @@ public class Chunk implements IChunkAccess {
java.util.Iterator<Entity> iter = newList.iterator();
2014-04-12 14:18:37 +10:00
while (iter.hasNext()) {
Entity entity = iter.next();
2014-04-12 14:18:37 +10:00
+ // Spigot Start
+ if ( entity instanceof IInventory )
+ {
+ for ( org.bukkit.entity.HumanEntity h : Lists.<org.bukkit.entity.HumanEntity>newArrayList( (List<org.bukkit.entity.HumanEntity>) ( (IInventory) entity ).getViewers() ) )
2014-04-12 14:18:37 +10:00
+ {
+ if ( h instanceof org.bukkit.craftbukkit.entity.CraftHumanEntity )
+ {
+ ( (org.bukkit.craftbukkit.entity.CraftHumanEntity) h).getHandle().closeInventory();
+ }
2014-04-12 14:18:37 +10:00
+ }
+ }
+ // Spigot End
// Do not pass along players, as doing so can get them stuck outside of time.
// (which for example disables inventory icon updates and prevents block breaking)
--
2019-04-23 09:33:25 +10:00
2.20.1
2014-04-12 14:18:37 +10:00