mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-30 04:02:50 +01:00
19972e09b8
5a0150f586ed3eb15fe6f1f596d1a5a7d806f0f9 Fix ITEM_BREAK e6a3911057bd94d8bd7021cbb4923fb84fb106d1 Upstream merge d1cdcf8d4c3639f956474f02ed662517cffbe23e Remove old patch 068df64aeee368377e1673667bffc7a6dcf90554 Rebuild all patches
58 lines
2.3 KiB
Diff
58 lines
2.3 KiB
Diff
From e95361cd8ad19c073e62e7f7048a4616bdd65708 Mon Sep 17 00:00:00 2001
|
|
From: Antony Riley <antony@cyberiantiger.org>
|
|
Date: Wed, 27 Mar 2013 01:41:54 +0200
|
|
Subject: [PATCH] Close Unloaded Save Files
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/RegionFileCache.java b/src/main/java/net/minecraft/server/RegionFileCache.java
|
|
index f4f72ef..1b03878 100644
|
|
--- a/src/main/java/net/minecraft/server/RegionFileCache.java
|
|
+++ b/src/main/java/net/minecraft/server/RegionFileCache.java
|
|
@@ -10,7 +10,7 @@ import java.util.Map;
|
|
|
|
public class RegionFileCache {
|
|
|
|
- private static final Map a = Maps.newHashMap();
|
|
+ public static final Map a = Maps.newHashMap(); // Spigot - private -> public
|
|
|
|
public static synchronized RegionFile a(File file, int i, int j) {
|
|
File file1 = new File(file, "region");
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
|
index 9d3d76e..ff06c34 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
|
@@ -950,6 +950,31 @@ public final class CraftServer implements Server {
|
|
|
|
worlds.remove(world.getName().toLowerCase());
|
|
console.worlds.remove(console.worlds.indexOf(handle));
|
|
+
|
|
+ File parentFolder = world.getWorldFolder().getAbsoluteFile();
|
|
+
|
|
+ // Synchronized because access to RegionFileCache.a is guarded by this lock.
|
|
+ synchronized (RegionFileCache.class) {
|
|
+ // RegionFileCache.a should be RegionFileCache.cache
|
|
+ Iterator<Map.Entry<File, RegionFile>> i = RegionFileCache.a.entrySet().iterator();
|
|
+ while(i.hasNext()) {
|
|
+ Map.Entry<File, RegionFile> entry = i.next();
|
|
+ File child = entry.getKey().getAbsoluteFile();
|
|
+ while (child != null) {
|
|
+ if (child.equals(parentFolder)) {
|
|
+ i.remove();
|
|
+ try {
|
|
+ entry.getValue().c(); // Should be RegionFile.close();
|
|
+ } catch (IOException ex) {
|
|
+ getLogger().log(Level.SEVERE, null, ex);
|
|
+ }
|
|
+ break;
|
|
+ }
|
|
+ child = child.getParentFile();
|
|
+ }
|
|
+ }
|
|
+ }
|
|
+
|
|
return true;
|
|
}
|
|
|
|
--
|
|
2.1.0
|
|
|