merged with 1.1 branch

This commit is contained in:
Space Toad committed 2012-01-15 19:16:08 +00:00
1 parent 87d4c2134c
commit bfd0cfe506
118 files changed
+17590 -16452

No files matched your search

+6 -22
View File
@@ -1,33 +1,18 @@
diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/server/MinecraftServer.java ../src_work/minecraft_server/net/minecraft/server/MinecraftServer.java
--- ../src_base/minecraft_server/net/minecraft/server/MinecraftServer.java 2011-07-17 00:28:07.755771900 +0200
+++ ../src_work/minecraft_server/net/minecraft/server/MinecraftServer.java 2011-07-17 00:28:09.485870900 +0200
@@ -333,41 +333,22 @@
}
finally
@@ -397,38 +397,7 @@
{
- System.exit(0);
+ try
+ {
+ stopServer();
+ serverStopped = true;
+ }
+ catch(Throwable throwable2)
+ {
+ throwable2.printStackTrace();
+ }
+ finally
+ {
+ System.exit(0);
+ }
System.exit(0);
}
- break MISSING_BLOCK_LABEL_350;
- }
}
- try
- {
- stopServer();
- serverStopped = true;
- }
- catch(Throwable throwable)
- catch (Throwable throwable)
- {
- throwable.printStackTrace();
- }
@@ -43,7 +28,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/server
- stopServer();
- serverStopped = true;
- }
- catch(Throwable throwable3)
- catch (Throwable throwable3)
- {
- throwable3.printStackTrace();
- }
@@ -53,10 +38,9 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/server
- }
- throw exception2;
}
+}
private void doTick()
{
diff U3 ../src_base/minecraft_server/net/minecraft/src/MLProp.java ../src_work/minecraft_server/net/minecraft/src/MLProp.java
--- ../src_base/minecraft_server/net/minecraft/src/MLProp.java Wed Nov 30 22:27:22 2011
+++ ../src_work/minecraft_server/net/minecraft/src/MLProp.java Sun Dec 04 14:31:04 2011