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

More compile fixes

Browse Source
This commit is contained in:
Zach Brown
2019-12-12 19:18:18 -06:00
parent b0dc983f21
commit 4565495711
30 changed files with 230 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Spigot-Server-Patches/0101-Optimize-UserCache-Thread-Safe.patch
View File

@@ -1,4 +1,4 @@
From 025d5128eaa1e73d661b4545dc3e44ed1b49414c Mon Sep 17 00:00:00 2001
From 01e45083672563157c8546ae0325ad38e8a9caa1 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
@@ -23,7 +23,7 @@ index 2a40bb0b8..38bf3ea44 100644
// Spigot end
}
diff --git a/src/main/java/net/minecraft/server/UserCache.java b/src/main/java/net/minecraft/server/UserCache.java
index 65659996c..566f3db39 100644
index 65659996c..d32bec70d 100644
--- a/src/main/java/net/minecraft/server/UserCache.java
+++ b/src/main/java/net/minecraft/server/UserCache.java
@@ -43,8 +43,8 @@ public class UserCache {
@@ -66,15 +66,7 @@ index 65659996c..566f3db39 100644
String s1 = s.toLowerCase(Locale.ROOT);
UserCache.UserCacheEntry usercache_usercacheentry = (UserCache.UserCacheEntry) this.d.get(s1);
@@ -164,6 +165,7 @@ public class UserCache {
return usercache_usercacheentry == null ? null : usercache_usercacheentry.a();
}
+ @Nullable public GameProfile getProfile(UUID uuid) { return a(uuid); } // Paper - OBFHELPER
@Nullable
public GameProfile getProfile(UUID uuid) {
UserCache.UserCacheEntry usercache_usercacheentry = (UserCache.UserCacheEntry) this.e.get(uuid);
@@ -220,8 +222,15 @@ public class UserCache {
@@ -220,8 +221,15 @@ public class UserCache {
}
@@ -90,7 +82,7 @@ index 65659996c..566f3db39 100644
BufferedWriter bufferedwriter = null;
try {
@@ -235,6 +244,14 @@ public class UserCache {
@@ -235,6 +243,14 @@ public class UserCache {
} finally {
IOUtils.closeQuietly(bufferedwriter);
}
@@ -106,5 +98,5 @@ index 65659996c..566f3db39 100644
}
--
2.17.1
2.24.0