core
/
testserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove accidentally added code

This commit is contained in:
md_5 2014-01-13 08:28:17 +11:00
parent 58dc769bb5
commit 83c105ef02
1 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
CraftBukkit-Patches/0094-Replace-AutoSave-Mechanism.patch
View File

@ -1,4 +1,4 @@
From 09283936f2eee905563b6ba5920735fb48ce1ab7 Mon Sep 17 00:00:00 2001 From c358cbf157659bd9e47dd01e3540e22bbd3127ae Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net> From: md_5 <git@md-5.net>
Date: Sun, 12 Jan 2014 21:07:18 +1100 Date: Sun, 12 Jan 2014 21:07:18 +1100
Subject: [PATCH] Replace AutoSave Mechanism Subject: [PATCH] Replace AutoSave Mechanism
@ -6,7 +6,7 @@ Subject: [PATCH] Replace AutoSave Mechanism
The problem here is that MinecraftServer.save(..), will attempt to sleep whilst all pending chunks are written to disk, however due to various and complicated bugs, it will wait for an incorrect amount of chunks, which may cause it to sleep for an overly long amount of time. Instead we will mimic the save-all command in its behaviour, which is both safe and performant. The problem here is that MinecraftServer.save(..), will attempt to sleep whilst all pending chunks are written to disk, however due to various and complicated bugs, it will wait for an incorrect amount of chunks, which may cause it to sleep for an overly long amount of time. Instead we will mimic the save-all command in its behaviour, which is both safe and performant.
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index c58c73e..ad95402 100644 index c58c73e..c158e8a 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java --- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -555,7 +555,16 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo @@ -555,7 +555,16 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
@ -27,14 +27,6 @@ index c58c73e..ad95402 100644
this.methodProfiler.b(); this.methodProfiler.b();
} }
@@ -627,6 +636,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
try {
worldserver.doTick();
} catch (Throwable throwable) {
+ getServer().server.getMessenger().registerOutgoingPluginChannel( null, d );
// Spigot Start
try {
crashreport = CrashReport.a(throwable, "Exception ticking world");
-- --
1.8.3.2 1.8.3.2