Update upstream B/CB/S

This commit is contained in:
Zach Brown
2016-07-15 17:36:53 -05:00
parent d67763d7a3
commit f1691b34c5
20 changed files with 107 additions and 106 deletions

View File

@@ -1,4 +1,4 @@
From be4a05986327340da70869849edc7c950329ebb9 Mon Sep 17 00:00:00 2001
From 738cd6e34f6484356db8a62bf78ce72369689b67 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Mon, 16 May 2016 20:47:41 -0400
Subject: [PATCH] Optimize UserCache / Thread Safe
@@ -10,10 +10,10 @@ Additionally, move Saving of the User cache to be done async, incase
the user never changed the default setting for Spigot's save on stop only.
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 0392042..0f5502c 100644
index 0ebc566..b771d3d 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -505,7 +505,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
@@ -500,7 +500,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
// Spigot start
if (org.spigotmc.SpigotConfig.saveUserCacheOnStopOnly) {
LOGGER.info("Saving usercache.json");
@@ -96,5 +96,5 @@ index ccfc755..989758c 100644
}
--
2.9.0
2.9.0.windows.1