Update Upstream

This commit is contained in:
Aikar
2018-07-21 16:03:10 -04:00
parent ff4ae7b05e
commit dc8f516424
23 changed files with 165 additions and 149 deletions

View File

@@ -1,4 +1,4 @@
From 6a9d38a4159ce7e437079963862bfbf5baf9c766 Mon Sep 17 00:00:00 2001
From 1b066a794864bf5d0073b12f7d575ee00775466e 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 e11289217..49b2c27c6 100644
index 05dc8451e..0e59fc9eb 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -631,7 +631,7 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati
@@ -632,7 +632,7 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati
// Spigot start
if (org.spigotmc.SpigotConfig.saveUserCacheOnStopOnly) {
LOGGER.info("Saving usercache.json");