From f3fea246bf23305d9edf8d7e283c488334d2e918 Mon Sep 17 00:00:00 2001
From: Wouter Haffmans <wouter@simply-life.net>
Date: Fri, 19 Oct 2018 22:28:59 +0200
Subject: [PATCH] Fix loading profiles to solve 500 errors on login

This loads profiles from the server cache, which properly sets the uuid
(which again is used to check for bans in some other layers).

Backport of DynmapForge PR 77
---
 .../java/org/dynmap/forge_1_12_2/DynmapPlugin.java   | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/forge-1.12.2/src/main/java/org/dynmap/forge_1_12_2/DynmapPlugin.java b/forge-1.12.2/src/main/java/org/dynmap/forge_1_12_2/DynmapPlugin.java
index 7a2cd815..ee888498 100644
--- a/forge-1.12.2/src/main/java/org/dynmap/forge_1_12_2/DynmapPlugin.java
+++ b/forge-1.12.2/src/main/java/org/dynmap/forge_1_12_2/DynmapPlugin.java
@@ -43,6 +43,7 @@ import net.minecraft.network.NetworkManager;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.management.UserListBans;
 import net.minecraft.server.management.UserListIPBans;
+import net.minecraft.server.management.PlayerProfileCache;
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.SoundCategory;
 import net.minecraft.util.SoundEvent;
@@ -486,6 +487,11 @@ public class DynmapPlugin
 
         public ForgeServer() {
         }
+
+        private GameProfile getProfileByName(String player) {
+            PlayerProfileCache cache = server.getPlayerProfileCache();
+            return cache.getGameProfileForUsername(player);
+        }
         
         @Override
         public int getBlockIDAt(String wname, int x, int y, int z) {
@@ -601,7 +607,7 @@ public class DynmapPlugin
         public boolean isPlayerBanned(String pid)
         {
             UserListBans bl = server.getPlayerList().getBannedPlayers();
-            return bl.isBanned(new GameProfile(null, pid));
+            return bl.isBanned(getProfileByName(pid));
         }
         
         @Override
@@ -765,7 +771,7 @@ public class DynmapPlugin
             if (scm == null) return Collections.emptySet();
             UserListBans bl = scm.getBannedPlayers();
             if (bl == null) return Collections.emptySet();
-            if(bl.isBanned(new GameProfile(null, player))) {
+            if(bl.isBanned(getProfileByName(player))) {
                 return Collections.emptySet();
             }
             Set<String> rslt = hasOfflinePermissions(player, perms);
@@ -784,7 +790,7 @@ public class DynmapPlugin
             if (scm == null) return false;
             UserListBans bl = scm.getBannedPlayers();
             if (bl == null) return false;
-            if(bl.isBanned(new GameProfile(null, player))) {
+            if(bl.isBanned(getProfileByName(player))) {
                 return false;
             }
             return hasOfflinePermission(player, perm);