Update CraftBukkit to Minecraft 1.3.1

2012-07-29 02:33:13 -05:00
parent 08e2923bd4
commit a43d621c01
240 changed files with 10763 additions and 9150 deletions
--- a/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java
+++ b/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java
@@ -1,5 +1,6 @@
 package org.bukkit.craftbukkit.util;

+import net.minecraft.server.ExceptionWorldConflict;
 import net.minecraft.server.MinecraftServer;

 public class ServerShutdownThread extends Thread {
@@ -11,6 +12,15 @@ public class ServerShutdownThread extends Thread {

    @Override
    public void run() {
-        server.stop();
+        try {
+            server.stop();
+        } catch (ExceptionWorldConflict ex) {
+            ex.printStackTrace();
+        } finally {
+            try {
+                server.reader.getTerminal().restore();
+            } catch (Exception e) {
+            }
+        }
    }
 }