Skip to content

Commit 09c4b58

Browse files
committed
Fix printing of users in region popups
1 parent df61de6 commit 09c4b58

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

src/main/java/org/dynmap/worldguard/DynmapWorldGuardPlugin.java

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343
import com.sk89q.worldguard.protection.regions.ProtectedRegion;
4444
import com.sk89q.worldguard.protection.regions.RegionContainer;
4545
import com.sk89q.worldguard.protection.regions.RegionType;
46+
import com.sk89q.worldguard.util.profile.cache.ProfileCache;
4647

4748
public class DynmapWorldGuardPlugin extends JavaPlugin {
4849
private static Logger log;
@@ -52,6 +53,8 @@ public class DynmapWorldGuardPlugin extends JavaPlugin {
5253
DynmapAPI api;
5354
MarkerAPI markerapi;
5455
WorldGuardPlugin wg;
56+
private WorldGuardPlatform platform;
57+
private ProfileCache cache;
5558
BooleanFlag boost_flag;
5659
int updatesPerTick = 20;
5760

@@ -112,15 +115,13 @@ public static void severe(String msg) {
112115
}
113116

114117
private Map<String, AreaMarker> resareas = new HashMap<String, AreaMarker>();
115-
private WorldGuardPlatform platform;
116-
public WorldGuardPlatform p;
117118

118119
private String formatInfoWindow(ProtectedRegion region, AreaMarker m) {
119120
String v = "<div class=\"regioninfo\">"+infowindow+"</div>";
120121
v = v.replace("%regionname%", m.getLabel());
121-
v = v.replace("%playerowners%", region.getOwners().toPlayersString());
122+
v = v.replace("%playerowners%", region.getOwners().toPlayersString(cache));
122123
v = v.replace("%groupowners%", region.getOwners().toGroupsString());
123-
v = v.replace("%playermembers%", region.getMembers().toPlayersString());
124+
v = v.replace("%playermembers%", region.getMembers().toPlayersString(cache));
124125
v = v.replace("%groupmembers%", region.getMembers().toGroupsString());
125126
if(region.getParent() != null)
126127
v = v.replace("%parent%", region.getParent().getId());
@@ -390,6 +391,7 @@ public void onEnable() {
390391
wg = (WorldGuardPlugin)p;
391392

392393
platform = WorldGuard.getInstance().getPlatform();
394+
cache = WorldGuard.getInstance().getProfileCache();
393395

394396
getServer().getPluginManager().registerEvents(new OurServerListener(), this);
395397

0 commit comments

Comments
 (0)