SteamWar/Paper
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update upstream S

Browse Source
This commit is contained in:
Zach Brown
2017-01-30 22:33:54 -06:00
parent 013c024ca2
commit a3cc3e37bd
17 changed files with 96 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Spigot-Server-Patches/Auto-Save-Improvements.patch
View File

@@ -76,7 +76,7 @@ index 88437d77a..9f7f32dc2 100644
public Random a(long i) {
diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
index 7a56a6416..5c5a56c51 100644
index 25deecc4d..770abb51d 100644
--- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
+++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
@@ -0,0 +0,0 @@
@@ -108,7 +108,7 @@ index b5e386501..d67493666 100644
public final MinecraftServer server;
public final PlayerInteractManager playerInteractManager;
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index b3e0ef7fb..9cdcdc45a 100644
index 4078824f7..e04bade5b 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -0,0 +0,0 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
@@ -117,8 +117,8 @@ index b3e0ef7fb..9cdcdc45a 100644
public int autosavePeriod;
+ public boolean serverAutoSave = false; // Paper
// CraftBukkit end
public MinecraftServer(OptionSet options, Proxy proxy, DataConverterManager dataconvertermanager, YggdrasilAuthenticationService yggdrasilauthenticationservice, MinecraftSessionService minecraftsessionservice, GameProfileRepository gameprofilerepository, UserCache usercache) {
// Spigot start
public final SlackActivityAccountant slackActivityAccountant = new SlackActivityAccountant();
@@ -0,0 +0,0 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
this.q.b().a(agameprofile);
}
@@ -153,7 +153,7 @@ index b3e0ef7fb..9cdcdc45a 100644
+ //} // Paper - Incremental Auto Saving
this.methodProfiler.a("tallying");
this.h[this.ticks % 100] = System.nanoTime() - i;
// Spigot start
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
index be67df061..f675a7013 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java