Patches 100-260 (#2729)

This commit is contained in:
MiniDigger | Martin
2019-12-12 00:43:22 +01:00
parent 2dc2fcce09
commit c9ef3d1cfc
159 changed files with 639 additions and 954 deletions

View File

@@ -10,7 +10,7 @@ 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 17b9e9a31d..6a2933f4ff 100644
index 2a40bb0b8..38bf3ea44 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 extends IAsyncTaskHandlerReentrant<TickTas
@@ -23,7 +23,7 @@ index 17b9e9a31d..6a2933f4ff 100644
// Spigot end
}
diff --git a/src/main/java/net/minecraft/server/UserCache.java b/src/main/java/net/minecraft/server/UserCache.java
index 57d053e9ff..ea02567554 100644
index 65659996c..566f3db39 100644
--- a/src/main/java/net/minecraft/server/UserCache.java
+++ b/src/main/java/net/minecraft/server/UserCache.java
@@ -0,0 +0,0 @@ public class UserCache {
@@ -72,7 +72,7 @@ index 57d053e9ff..ea02567554 100644
+ @Nullable public GameProfile getProfile(UUID uuid) { return a(uuid); } // Paper - OBFHELPER
@Nullable
public GameProfile a(UUID uuid) {
public GameProfile getProfile(UUID uuid) {
UserCache.UserCacheEntry usercache_usercacheentry = (UserCache.UserCacheEntry) this.e.get(uuid);
@@ -0,0 +0,0 @@ public class UserCache {