Parsing placeholders for potentially offline players

Author: Zrips

src/main/java/com/bekvon/bukkit/residence/Placeholders/Placeholder.java

@@ -10,6 +10,7 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 
 import com.bekvon.bukkit.residence.Residence;
@@ -69,7 +70,7 @@ public enum CMIPlaceHolders {
         residence_user_current_rentdays,
         residence_user_current_rentends,
         residence_user_current_flag_$1("Get flags from current residence by flag name", "flagName"),
-        
+
         ;
 
         static {
@@ -364,16 +365,23 @@ public String getValue(Player player, CMIPlaceHolders placeHolder) {
     }
 
     public String getValue(Player player, CMIPlaceHolders placeHolder, String value) {
+        return getValue(player != null ? player.getUniqueId() : null, placeHolder, value);
+    }
+
+    public String getValue(UUID uuid, CMIPlaceHolders placeHolder, String value) {
 
-        if (placeHolder == null)
+        if (placeHolder == null || uuid == null)
             return null;
 
-        Object cached = placeHolder.getCachedValue(player != null ? player.getUniqueId() : null);
+        Player player = Bukkit.getPlayer(uuid);
+
+        Object cached = placeHolder.getCachedValue(uuid);
+
         if (cached != null) {
             return (String) cached;
         }
 
-        ResidencePlayer user = ResidencePlayer.get(player);
+        ResidencePlayer user = ResidencePlayer.get(uuid);
 
         String result = null;
 
@@ -514,7 +522,7 @@ public String getValue(Player player, CMIPlaceHolders placeHolder, String value)
                         values = placeHolder.getComplexValues(value);
                         if (values.isEmpty())
                             return "";
-                         res = plugin.getResidenceManager().getByName(values.get(0));                         
+                        res = plugin.getResidenceManager().getByName(values.get(0));
                         if (res == null)
                             return "";
                         return res == null ? "" : res.getName();

src/main/java/com/bekvon/bukkit/residence/Placeholders/PlaceholderAPIHook.java

@@ -1,6 +1,10 @@
 package com.bekvon.bukkit.residence.Placeholders;
 
+import java.util.UUID;
+
+import org.bukkit.OfflinePlayer;
 import org.bukkit.entity.Player;
+import org.jetbrains.annotations.NotNull;
 
 import com.bekvon.bukkit.residence.Residence;
 import com.bekvon.bukkit.residence.Placeholders.Placeholder.CMIPlaceHolders;
@@ -41,12 +45,20 @@ public String getVersion() {
     }
 
     @Override
-    public String onPlaceholderRequest(Player player, String identifier) {
+    public String onPlaceholderRequest(Player player, @NotNull String identifier) {
+        return process(player == null ? null : player.getUniqueId(), identifier);
+    }
+
+    @Override
+    public String onRequest(OfflinePlayer player, @NotNull String identifier) {
+        return process(player == null ? null : player.getUniqueId(), identifier);
+    }
 
+    private String process(UUID uuid, String identifier) {
         CMIPlaceHolders placeHolder = CMIPlaceHolders.getByName("residence_" + identifier);
         if (placeHolder == null) {
             return null;
         }
-        return plugin.getPlaceholderAPIManager().getValue(player, placeHolder, "residence_" + identifier);
+        return plugin.getPlaceholderAPIManager().getValue(uuid, placeHolder, "residence_" + identifier);
     }
 }

src/main/java/com/bekvon/bukkit/residence/protection/ResidencePermissions.java

@@ -92,6 +92,8 @@ public boolean playerHas(String player, String flag, boolean def) {
 
     @Override
     public boolean playerHas(Player player, Flags flag, FlagCombo f) {
+        if (player == null)
+            return false;
         return playerHas(player.getUniqueId(), flag, f);
     }