From 864ef24fc0773429d434d4044186fc430a395c18 Mon Sep 17 00:00:00 2001
From: MiniDigger <admin@minidigger.me>
Date: Sat, 12 Jun 2021 09:30:37 +0200
Subject: [PATCH] fix profile cache mappings

let me be OP god dammit!
---
 build-data/mappings-patch.tiny                            | 5 +++++
 patches/server/0094-Optimize-UserCache-Thread-Safe.patch  | 8 ++++----
 .../0101-Add-setting-for-proxy-online-mode-status.patch   | 8 ++++----
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/build-data/mappings-patch.tiny b/build-data/mappings-patch.tiny
index 572cb1137..b15b9e635 100644
--- a/build-data/mappings-patch.tiny
+++ b/build-data/mappings-patch.tiny
@@ -78,3 +78,8 @@ c	net/minecraft/world/entity/projectile/EntityTippedArrow	net/minecraft/world/en
 # missed mapping?
 c	net/minecraft/world/level/block/MultifaceBlock	net/minecraft/world/level/block/MultifaceBlock
 	m	(Lnet/minecraft/world/level/block/state/IBlockData;Lnet/minecraft/world/level/IBlockAccess;Lnet/minecraft/core/BlockPosition;Lnet/minecraft/core/EnumDirection;)Lnet/minecraft/world/level/block/state/IBlockData;	c	getStateForPlacement
+
+# another missed one
+c	net/minecraft/server/players/UserCache	net/minecraft/server/players/GameProfileCache
+	m	(Ljava/lang/String;)Lcom/mojang/authlib/GameProfile;	getProfile	get
+		p	0		name
diff --git a/patches/server/0094-Optimize-UserCache-Thread-Safe.patch b/patches/server/0094-Optimize-UserCache-Thread-Safe.patch
index 70a622d00..3104361cd 100644
--- a/patches/server/0094-Optimize-UserCache-Thread-Safe.patch
+++ b/patches/server/0094-Optimize-UserCache-Thread-Safe.patch
@@ -38,7 +38,7 @@ index 566390d02b2af4a0f2c867b7ff8116a8301e8497..e2095308a8ec8471b04acce929d314fd
  
          if (!OldUsersConverter.serverReadyAfterUserconversion(this)) {
 diff --git a/src/main/java/net/minecraft/server/players/GameProfileCache.java b/src/main/java/net/minecraft/server/players/GameProfileCache.java
-index 8b972d0fec5636b1979abf4055ea8d29530158f4..95682f63c7ae1460b069e13f11295f72c1f262a8 100644
+index 1dd9b362384543e17b537dd209665d956214916d..c70b4727fe0ae9ff7b9db08a9711272994159b96 100644
 --- a/src/main/java/net/minecraft/server/players/GameProfileCache.java
 +++ b/src/main/java/net/minecraft/server/players/GameProfileCache.java
 @@ -117,7 +117,7 @@ public class GameProfileCache {
@@ -63,9 +63,9 @@ index 8b972d0fec5636b1979abf4055ea8d29530158f4..95682f63c7ae1460b069e13f11295f72
      }
  
      @Nullable
--    public GameProfile getProfile(String s) {
-+    public synchronized GameProfile getProfile(String s) { // Paper - synchronize
-         String s1 = s.toLowerCase(Locale.ROOT);
+-    public GameProfile get(String name) {
++    public synchronized GameProfile get(String name) { // Paper - synchronize
+         String s1 = name.toLowerCase(Locale.ROOT);
          GameProfileCache.GameProfileInfo usercache_usercacheentry = (GameProfileCache.GameProfileInfo) this.profilesByName.get(s1);
          boolean flag = false;
 @@ -160,7 +160,7 @@ public class GameProfileCache {
diff --git a/patches/server/0101-Add-setting-for-proxy-online-mode-status.patch b/patches/server/0101-Add-setting-for-proxy-online-mode-status.patch
index 16e6c2528..da61f74c6 100644
--- a/patches/server/0101-Add-setting-for-proxy-online-mode-status.patch
+++ b/patches/server/0101-Add-setting-for-proxy-online-mode-status.patch
@@ -32,7 +32,7 @@ index 1b8e5671c9dc8c15ce33d351c1bb20f28919b9a2..c52dc0346f93527965ef29a0ccdc4bf3
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/players/GameProfileCache.java b/src/main/java/net/minecraft/server/players/GameProfileCache.java
-index b2bd204879badfe1cab6bea9db2d6c412505a9ce..73dbc4db56bbafefd07ad550d006a437b1ed1b95 100644
+index 87f5f4108796aa12b454bbf39b8c1d699bac78f2..3eb4bee81a8543cc06b9d5898f5f6c0e9dbbf554 100644
 --- a/src/main/java/net/minecraft/server/players/GameProfileCache.java
 +++ b/src/main/java/net/minecraft/server/players/GameProfileCache.java
 @@ -97,6 +97,7 @@ public class GameProfileCache {
@@ -53,7 +53,7 @@ index b2bd204879badfe1cab6bea9db2d6c412505a9ce..73dbc4db56bbafefd07ad550d006a437
  
      public synchronized void add(GameProfile profile) { // Paper - synchronize
 diff --git a/src/main/java/net/minecraft/server/players/OldUsersConverter.java b/src/main/java/net/minecraft/server/players/OldUsersConverter.java
-index da515ac94aa3c294855f28e6deb9094cc7187dd9..b61a3217c70f3f5c4c06131b3c4978534d7d935a 100644
+index 8e27b43e2f6ce4d7f5007fe02db1722e73c30a58..6aacc724c8c8d6fbe3067226989039ca9cee4929 100644
 --- a/src/main/java/net/minecraft/server/players/OldUsersConverter.java
 +++ b/src/main/java/net/minecraft/server/players/OldUsersConverter.java
 @@ -65,7 +65,8 @@ public class OldUsersConverter {
@@ -67,7 +67,7 @@ index da515ac94aa3c294855f28e6deb9094cc7187dd9..b61a3217c70f3f5c4c06131b3c497853
          } else {
              String[] astring1 = astring;
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 95689d11668e37a894b70517270849c2c4e162aa..91002473f54fd0ac95489b9448fe91072565881d 100644
+index 290dd0b3f90d57e9fe4ae06e4c4a0a30a1c15bfc..5fafb27748102356cdeb6c5a78bb671a00afccc3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1515,7 +1515,7 @@ public final class CraftServer implements Server {
@@ -77,5 +77,5 @@ index 95689d11668e37a894b70517270849c2c4e162aa..91002473f54fd0ac95489b9448fe9107
 -            if ( this.getOnlineMode() || org.spigotmc.SpigotConfig.bungee )
 +            if ( this.getOnlineMode() || com.destroystokyo.paper.PaperConfig.isProxyOnlineMode() ) // Paper - Handle via setting
              {
-                 profile = this.console.getProfileCache().getProfile( name );
+                 profile = this.console.getProfileCache().get( name );
              }