EpicKnarvik97/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2025-08-24 23:05:36 +02:00
Code Issues Projects Releases Wiki Activity

Fix a few remaining merge issues (+1 squashed commits)

Browse Source 
Squashed commits:

[8c6b55dd4] Fix a few remaining merge issues
This commit is contained in:
dordsor21
2020-07-24 17:52:05 +01:00
parent 3180d2ddf2
commit 221d299052
12 changed files with 504 additions and 641 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Bukkit/src/main/java/com/plotsquared/bukkit/placeholder/PAPIPlaceholders.java
View File

@@ -57,7 +57,7 @@ public class PAPIPlaceholders extends PlaceholderExpansion {
}
@Override public String onPlaceholderRequest(Player p, String identifier) {
final PlotPlayer<?> pl = PlotSquared.imp().getPlayerManager().getPlayerIfExists(p.getUniqueId());
final PlotPlayer<?> pl = PlotSquared.platform().getPlayerManager().getPlayerIfExists(p.getUniqueId());
if (pl == null) {
return "";