Skip to content

Commit d5f75b5

Browse files
committed
Update for WG 7.0.0 GA
1 parent 87245df commit d5f75b5

File tree

2 files changed

+13
-7
lines changed

2 files changed

+13
-7
lines changed

pom.xml

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,13 +68,18 @@
6868
</dependency>
6969
<dependency>
7070
<groupId>com.sk89q.worldguard</groupId>
71-
<artifactId>worldguard-core</artifactId>
72-
<version>7.0.0-SNAPSHOT</version>
71+
<artifactId>worldguard-bukkit</artifactId>
72+
<version>7.0.0</version>
7373
</dependency>
7474
<dependency>
7575
<groupId>com.sk89q.worldedit</groupId>
76-
<artifactId>worldedit-core</artifactId>
77-
<version>7.0.0-SNAPSHOT</version>
76+
<artifactId>worldedit-bukkit</artifactId>
77+
<version>7.0.0</version>
78+
</dependency>
79+
<dependency>
80+
<groupId>com.sk89q</groupId>
81+
<artifactId>squirrelid</artifactId>
82+
<version>0.2.0</version>
7883
</dependency>
7984
</dependencies>
8085
<version>1.2-SNAPSHOT</version>

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,13 @@
2626
import org.dynmap.markers.MarkerAPI;
2727
import org.dynmap.markers.MarkerSet;
2828

29+
import com.sk89q.squirrelid.cache.ProfileCache;
2930
import com.sk89q.worldedit.math.BlockVector2;
3031
import com.sk89q.worldedit.math.BlockVector3;
3132
import com.sk89q.worldedit.world.World;
3233
import com.sk89q.worldguard.WorldGuard;
3334
import com.sk89q.worldguard.domains.DefaultDomain;
3435
import com.sk89q.worldguard.domains.PlayerDomain;
35-
import com.sk89q.worldguard.internal.platform.WorldGuardPlatform;
3636
import com.sk89q.worldguard.protection.flags.BooleanFlag;
3737
import com.sk89q.worldguard.protection.flags.Flag;
3838
import com.sk89q.worldguard.protection.flags.registry.FlagRegistry;
@@ -112,10 +112,11 @@ public static void severe(String msg) {
112112

113113
private String formatInfoWindow(ProtectedRegion region, AreaMarker m) {
114114
String v = "<div class=\"regioninfo\">"+infowindow+"</div>";
115+
ProfileCache pc = WorldGuard.getInstance().getProfileCache();
115116
v = v.replace("%regionname%", m.getLabel());
116-
v = v.replace("%playerowners%", region.getOwners().toPlayersString(WorldGuard.getInstance().getProfileCache()));
117+
v = v.replace("%playerowners%", region.getOwners().toPlayersString(pc));
117118
v = v.replace("%groupowners%", region.getOwners().toGroupsString());
118-
v = v.replace("%playermembers%", region.getMembers().toPlayersString(WorldGuard.getInstance().getProfileCache()));
119+
v = v.replace("%playermembers%", region.getMembers().toPlayersString(pc));
119120
v = v.replace("%groupmembers%", region.getMembers().toGroupsString());
120121
if(region.getParent() != null)
121122
v = v.replace("%parent%", region.getParent().getId());

0 commit comments

Comments
 (0)