Fix printing of users in region popups

master
Mike Primm 7 years ago
parent df61de616c
commit 09c4b58bd9
  1. 10
      src/main/java/org/dynmap/worldguard/DynmapWorldGuardPlugin.java

@ -43,6 +43,7 @@ import com.sk89q.worldguard.protection.regions.ProtectedPolygonalRegion;
import com.sk89q.worldguard.protection.regions.ProtectedRegion; import com.sk89q.worldguard.protection.regions.ProtectedRegion;
import com.sk89q.worldguard.protection.regions.RegionContainer; import com.sk89q.worldguard.protection.regions.RegionContainer;
import com.sk89q.worldguard.protection.regions.RegionType; import com.sk89q.worldguard.protection.regions.RegionType;
import com.sk89q.worldguard.util.profile.cache.ProfileCache;
public class DynmapWorldGuardPlugin extends JavaPlugin { public class DynmapWorldGuardPlugin extends JavaPlugin {
private static Logger log; private static Logger log;
@ -52,6 +53,8 @@ public class DynmapWorldGuardPlugin extends JavaPlugin {
DynmapAPI api; DynmapAPI api;
MarkerAPI markerapi; MarkerAPI markerapi;
WorldGuardPlugin wg; WorldGuardPlugin wg;
private WorldGuardPlatform platform;
private ProfileCache cache;
BooleanFlag boost_flag; BooleanFlag boost_flag;
int updatesPerTick = 20; int updatesPerTick = 20;
@ -112,15 +115,13 @@ public class DynmapWorldGuardPlugin extends JavaPlugin {
} }
private Map<String, AreaMarker> resareas = new HashMap<String, AreaMarker>(); private Map<String, AreaMarker> resareas = new HashMap<String, AreaMarker>();
private WorldGuardPlatform platform;
public WorldGuardPlatform p;
private String formatInfoWindow(ProtectedRegion region, AreaMarker m) { private String formatInfoWindow(ProtectedRegion region, AreaMarker m) {
String v = "<div class=\"regioninfo\">"+infowindow+"</div>"; String v = "<div class=\"regioninfo\">"+infowindow+"</div>";
v = v.replace("%regionname%", m.getLabel()); v = v.replace("%regionname%", m.getLabel());
v = v.replace("%playerowners%", region.getOwners().toPlayersString()); v = v.replace("%playerowners%", region.getOwners().toPlayersString(cache));
v = v.replace("%groupowners%", region.getOwners().toGroupsString()); v = v.replace("%groupowners%", region.getOwners().toGroupsString());
v = v.replace("%playermembers%", region.getMembers().toPlayersString()); v = v.replace("%playermembers%", region.getMembers().toPlayersString(cache));
v = v.replace("%groupmembers%", region.getMembers().toGroupsString()); v = v.replace("%groupmembers%", region.getMembers().toGroupsString());
if(region.getParent() != null) if(region.getParent() != null)
v = v.replace("%parent%", region.getParent().getId()); v = v.replace("%parent%", region.getParent().getId());
@ -390,6 +391,7 @@ public class DynmapWorldGuardPlugin extends JavaPlugin {
wg = (WorldGuardPlugin)p; wg = (WorldGuardPlugin)p;
platform = WorldGuard.getInstance().getPlatform(); platform = WorldGuard.getInstance().getPlatform();
cache = WorldGuard.getInstance().getProfileCache();
getServer().getPluginManager().registerEvents(new OurServerListener(), this); getServer().getPluginManager().registerEvents(new OurServerListener(), this);

Loading…
Cancel
Save