68 lines
2.8 KiB
Diff
68 lines
2.8 KiB
Diff
From e69033577aab7e5ace22b31a00d1e8f4a418d83a Mon Sep 17 00:00:00 2001
|
|
From: Antony Riley <antony@cyberiantiger.org>
|
|
Date: Wed, 27 Mar 2013 01:41:54 +0200
|
|
Subject: [PATCH] Fixes BUKKIT-3893 - Close world save files when world is
|
|
unloaded.
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/RegionFileCache.java b/src/main/java/net/minecraft/server/RegionFileCache.java
|
|
index 900ed68..829f4a3 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 = new HashMap();
|
|
+ public static final Map a = new HashMap(); // CraftBukkit - private -> public
|
|
|
|
public static synchronized RegionFile a(File file1, int i, int j) {
|
|
File file2 = new File(file1, "region");
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
|
index 2485ef9..b6fe332 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
|
@@ -37,6 +37,8 @@ import net.minecraft.server.MinecraftServer;
|
|
import net.minecraft.server.MobEffectList;
|
|
import net.minecraft.server.PropertyManager;
|
|
import net.minecraft.server.ServerCommand;
|
|
+import net.minecraft.server.RegionFile;
|
|
+import net.minecraft.server.RegionFileCache;
|
|
import net.minecraft.server.ServerNBTManager;
|
|
import net.minecraft.server.WorldLoaderServer;
|
|
import net.minecraft.server.WorldManager;
|
|
@@ -831,6 +833,30 @@ 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;
|
|
}
|
|
|
|
--
|
|
1.8.1.2
|
|
|