From f3a6ec65cc36b808080de6beba1324f9738d00d2 Mon Sep 17 00:00:00 2001
From: Sotr <i@omc.hk>
Date: Sun, 7 Apr 2019 13:29:56 +0800
Subject: [PATCH] Better handle offline servers

---
 .../net/minecraft/server/AkarinUserCache.java | 49 +++++++++++--------
 .../java/net/minecraft/server/PlayerList.java |  2 +-
 2 files changed, 29 insertions(+), 22 deletions(-)

diff --git a/src/main/java/net/minecraft/server/AkarinUserCache.java b/src/main/java/net/minecraft/server/AkarinUserCache.java
index 59e0792a6..4cb526acd 100644
--- a/src/main/java/net/minecraft/server/AkarinUserCache.java
+++ b/src/main/java/net/minecraft/server/AkarinUserCache.java
@@ -7,6 +7,7 @@ import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
+import java.util.Collections;
 import java.util.Date;
 import java.util.List;
 import java.util.Locale;
@@ -130,7 +131,7 @@ public class AkarinUserCache {
         ProfileLookupCallback callbackHandler = new ProfileLookupCallback() {
             @Override
             public void onProfileLookupSucceeded(GameProfile gameprofile) {
-                profiles.put(isOnlineMode() ? username : username.toLowerCase(Locale.ROOT), new UserCacheEntry(gameprofile, date));
+                profiles.put(username, new UserCacheEntry(gameprofile, date));
                 if (async)
                     callback.onProfileLookupSucceeded(gameprofile);
                 
@@ -186,47 +187,50 @@ public class AkarinUserCache {
 
     @Nullable
     public GameProfile peek(String username) {
-        String keyUsername = isOnlineMode() ? username : username.toLowerCase(Locale.ROOT);
-        UserCacheEntry entry = profiles.getIfPresent(keyUsername);
+        if (!isOnlineMode()) {
+            String usernameOffline = username.toLowerCase(Locale.ROOT);
+            GameProfile offlineProfile = new GameProfile(EntityHuman.getOfflineUUID(usernameOffline), username);
+            return offlineProfile;
+        }
+        
+        UserCacheEntry entry = profiles.getIfPresent(username);
         return entry == null ? null : entry.getProfile();
     }
 
     protected void offer(GameProfile profile) {
+        if (!isOnlineMode())
+            return;
+
         offer(profile, createExpireDate(false));
     }
 
     protected void offer(GameProfile profile, Date date) {
-        String keyUsername = isOnlineMode() ? profile.getName() : profile.getName().toLowerCase(Locale.ROOT);
-        UserCacheEntry entry = profiles.getIfPresent(keyUsername);
+        if (!isOnlineMode())
+            return;
 
-        if (entry != null) {
-            // The offered profile may has an raw case, this only happened on offline servers with old caches,
-            // so replace with an lower-case profile.
-            if (!UserCache.isOnlineMode() && !entry.getProfile().getName().equals(profile.getName()))
-                entry = new UserCacheEntry(new GameProfile(entry.getProfile().getId(), keyUsername), date);
-            else
-                entry = refreshExpireDate(entry);
-        } else {
-            entry = new UserCacheEntry(profile, date);
-        }
+        String username = profile.getName();
+        UserCacheEntry entry = profiles.getIfPresent(username);
+        entry = entry != null ? refreshExpireDate(entry) : new UserCacheEntry(profile, date);
 
-        profiles.put(keyUsername, entry);
+        profiles.put(username, entry);
         if (!SpigotConfig.saveUserCacheOnStopOnly)
             this.save();
     }
 
     private void offer(UserCacheEntry entry) {
-        if (!isExpired(entry))
-            profiles.put(isOnlineMode() ? entry.getProfile().getName() : entry.getProfile().getName().toLowerCase(Locale.ROOT), entry);
+        if (isOnlineMode() && !isExpired(entry))
+            profiles.put(entry.getProfile().getName(), entry);
     }
 
     protected String[] usernames() {
-        return profiles.asMap().keySet().toArray(new String[profiles.asMap().size()]);
+        return isOnlineMode() ? profiles.asMap().keySet().toArray(new String[profiles.asMap().size()]) : new String[0];
     }
 
     protected void load() {
+        if (!isOnlineMode())
+            return;
+        
         BufferedReader reader = null;
-
         try {
             reader = Files.newReader(userCacheFile, Charsets.UTF_8);
             List<UserCacheEntry> entries = this.gson.fromJson(reader, UserCache.PARAMETERIZED_TYPE);
@@ -251,6 +255,9 @@ public class AkarinUserCache {
     }
     
     protected void save(boolean async) {
+        if (!isOnlineMode())
+            return;
+        
         Runnable save = () -> {
             String jsonString = this.gson.toJson(this.entries());
             BufferedWriter writer = null;
@@ -275,6 +282,6 @@ public class AkarinUserCache {
     }
 
     protected List<UserCacheEntry> entries() {
-        return Lists.newArrayList(profiles.asMap().values());
+        return isOnlineMode() ? Lists.newArrayList(profiles.asMap().values()) : Collections.emptyList();
     }
 }
\ No newline at end of file
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
index c799c2892..c98289f6d 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -533,7 +533,7 @@ public abstract class PlayerList {
 
         for (int i = 0; i < this.players.size(); ++i) {
             entityplayer = (EntityPlayer) this.players.get(i);
-            if (AkarinUserCache.isOnlineMode() ? entityplayer.getUniqueID().equals(uuid) : entityplayer.getName().equals(gameprofile.getName())) { // Akarin - resolve offline servers
+            if (AkarinUserCache.isOnlineMode() ? entityplayer.getUniqueID().equals(uuid) : entityplayer.getName().equalsIgnoreCase(gameprofile.getName())) { // Akarin - resolve offline servers
                 list.add(entityplayer);
             }
         }