Fix some more compile errors

This commit is contained in:
Spottedleaf
2019-05-05 20:53:47 -07:00
parent eeb2ecd789
commit 8dfd5dc0c4
22 changed files with 110 additions and 83 deletions

View File

@@ -1,4 +1,4 @@
From 789d81cfb7edd8ad81d1ac6981ff1ca9377e16bd Mon Sep 17 00:00:00 2001
From 31148f6d3e9ada3c1c1a8d78fa006e1f0602dcd9 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Thu, 22 Mar 2018 01:40:24 -0400
Subject: [PATCH] getPlayerUniqueId API
@@ -9,10 +9,10 @@ In Offline Mode, will return an Offline UUID
This is a more performant way to obtain a UUID for a name than loading an OfflinePlayer
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 9f2aa9570b..91c86e451f 100644
index 0732a6f218..45710c0d2a 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1354,6 +1354,26 @@ public final class CraftServer implements Server {
@@ -1355,6 +1355,26 @@ public final class CraftServer implements Server {
return recipients.size();
}
@@ -25,7 +25,7 @@ index 9f2aa9570b..91c86e451f 100644
+ }
+ GameProfile profile;
+ // Only fetch an online UUID in online mode
+ if (MinecraftServer.getServer().getOnlineMode()
+ if (net.minecraft.server.MinecraftServer.getServer().getOnlineMode()
+ || (org.spigotmc.SpigotConfig.bungee && com.destroystokyo.paper.PaperConfig.bungeeOnlineMode)) {
+ profile = console.getUserCache().getProfile( name );
+ } else {