Repo-Mirror/OldSliceMC
9
0
Fork 0
Code Issues Pull Requests Releases Activity

Update upstream S

Browse Source
This commit is contained in:
Zach Brown
2017-01-30 22:33:54 -06:00
parent e08ef5457a
commit 1e1541a2e9
17 changed files with 168 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Spigot-Server-Patches/0136-Optimize-UserCache-Thread-Safe.patch
View File

@@ -1,4 +1,4 @@
From 96eb4bf4c891c95001f255a538ae3156e1996ca8 Mon Sep 17 00:00:00 2001
From bd719bf59cf2a9071c52afa26605638b1d97100a 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 631a87f..b3e0ef7 100644
index 15e543368..4078824f7 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -523,7 +523,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
@@ -527,7 +527,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
// Spigot start
if (org.spigotmc.SpigotConfig.saveUserCacheOnStopOnly) {
LOGGER.info("Saving usercache.json");
@@ -23,7 +23,7 @@ index 631a87f..b3e0ef7 100644
// Spigot end
}
diff --git a/src/main/java/net/minecraft/server/UserCache.java b/src/main/java/net/minecraft/server/UserCache.java
index ccfc755..989758c 100644
index ccfc755d2..989758cdf 100644
--- a/src/main/java/net/minecraft/server/UserCache.java
+++ b/src/main/java/net/minecraft/server/UserCache.java
@@ -108,7 +108,7 @@ public class UserCache {
@@ -96,5 +96,5 @@ index ccfc755..989758c 100644
}
--
2.9.3
2.11.0.windows.3