EpicKnarvik97/PlotSquared
EpicKnarvik97/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-11-25 22:56:45 +01:00
Code Issues Projects Releases Wiki Activity

Fix plot owner placeholder. Fixes PS-62.

Browse Source
This commit is contained in:
Alexander Söderberg 2020-07-09 16:38:46 +02:00
parent f2191cb731
commit e05d817482
No known key found for this signature in database
GPG Key ID: C0207FF7EA146678
2 changed files with 31 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Bukkit/src/main/java/com/plotsquared/bukkit/placeholder/Placeholders.java
View File

@ -26,17 +26,16 @@
package com.plotsquared.bukkit.placeholder; package com.plotsquared.bukkit.placeholder;
import com.plotsquared.core.PlotSquared; import com.plotsquared.core.PlotSquared;
import com.plotsquared.core.configuration.Settings;
import com.plotsquared.core.player.PlotPlayer; import com.plotsquared.core.player.PlotPlayer;
import com.plotsquared.core.plot.Plot; import com.plotsquared.core.plot.Plot;
import com.plotsquared.core.plot.flag.GlobalFlagContainer; import com.plotsquared.core.plot.flag.GlobalFlagContainer;
import com.plotsquared.core.plot.flag.PlotFlag; import com.plotsquared.core.plot.flag.PlotFlag;
import com.plotsquared.core.util.MainUtil;
import me.clip.placeholderapi.PlaceholderAPIPlugin; import me.clip.placeholderapi.PlaceholderAPIPlugin;
import me.clip.placeholderapi.expansion.PlaceholderExpansion; import me.clip.placeholderapi.expansion.PlaceholderExpansion;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import java.util.Set;
import java.util.UUID; import java.util.UUID;
public class Placeholders extends PlaceholderExpansion { public class Placeholders extends PlaceholderExpansion {
@ -117,23 +116,16 @@ public class Placeholders extends PlaceholderExpansion {
return plot.getAlias(); return plot.getAlias();
} }
case "currentplot_owner": { case "currentplot_owner": {
final Set<UUID> o = plot.getOwners(); final UUID plotOwner = plot.getOwnerAbs();
if (o == null || o.isEmpty()) { if (plotOwner == null) {
return "";
}
final UUID uid = (UUID) o.toArray()[0];
if (uid == null) {
return ""; return "";
} }
String name = PlotSquared.get().getImpromptuUUIDPipeline() try {
.getSingle(uid, Settings.UUID.BLOCKING_TIMEOUT); return MainUtil.getName(plotOwner, false);
} catch (final Exception ignored) {}
if (name != null) { final String name = Bukkit.getOfflinePlayer(plotOwner).getName();
return name;
}
name = Bukkit.getOfflinePlayer(uid).getName();
return name != null ? name : "unknown"; return name != null ? name : "unknown";
} }
case "currentplot_members": { case "currentplot_members": {

27
Core/src/main/java/com/plotsquared/core/util/MainUtil.java
View File

@ -372,10 +372,21 @@ public class MainUtil {
/** /**
* Get the name from a UUID. * Get the name from a UUID.
* *
* @param owner * @param owner Owner UUID
* @return The player's name, None, Everyone or Unknown * @return The player's name, None, Everyone or Unknown
*/ */
@NotNull public static String getName(UUID owner) { @NotNull public static String getName(@Nullable UUID owner) {
return getName(owner, true);
}
/**
* Get the name from a UUID.
*
* @param owner Owner UUID
* @param blocking Whether or not the operation can be blocking
* @return The player's name, None, Everyone or Unknown
*/
@NotNull public static String getName(@Nullable final UUID owner, final boolean blocking) {
if (owner == null) { if (owner == null) {
return Captions.NONE.getTranslated(); return Captions.NONE.getTranslated();
} }
@ -385,7 +396,17 @@ public class MainUtil {
if (owner.equals(DBFunc.SERVER)) { if (owner.equals(DBFunc.SERVER)) {
return Captions.SERVER.getTranslated(); return Captions.SERVER.getTranslated();
} }
String name = PlotSquared.get().getImpromptuUUIDPipeline().getSingle(owner, Settings.UUID.BLOCKING_TIMEOUT); final String name;
if (blocking) {
name = PlotSquared.get().getImpromptuUUIDPipeline().getSingle(owner, Settings.UUID.BLOCKING_TIMEOUT);
} else {
final UUIDMapping uuidMapping = PlotSquared.get().getImpromptuUUIDPipeline().getImmediately(owner);
if (uuidMapping != null) {
name = uuidMapping.getUsername();
} else {
name = null;
}
}
if (name == null) { if (name == null) {
return Captions.UNKNOWN.getTranslated(); return Captions.UNKNOWN.getTranslated();
} }