Upstream merge

By: md_5 <md_5@live.com.au>
This commit is contained in:
Spigot
2013-12-02 07:36:51 +11:00
parent 0656fd7a23
commit 9a876418c1
8 changed files with 33 additions and 33 deletions

View File

@@ -1,4 +1,4 @@
From 34d90bfbf38c020b7e10bb1fa2d3d95090f1a687 Mon Sep 17 00:00:00 2001
From 68903a9fb06c84df81f3b9aaeb0bc988aec38ad9 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
@@ -18,7 +18,7 @@ index 900ed68..829f4a3 100644
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 5eefd0d..5f5174b 100644
index 93e1782..13c1bbe 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -41,6 +41,8 @@ import net.minecraft.server.MinecraftServer;
@@ -30,7 +30,7 @@ index 5eefd0d..5f5174b 100644
import net.minecraft.server.ServerNBTManager;
import net.minecraft.server.WorldLoaderServer;
import net.minecraft.server.WorldManager;
@@ -850,6 +852,30 @@ public final class CraftServer implements Server {
@@ -849,6 +851,30 @@ public final class CraftServer implements Server {
worlds.remove(world.getName().toLowerCase());
console.worlds.remove(console.worlds.indexOf(handle));