Upstream/GriefDefender
1
0
Fork 0
mirror of https://github.com/bloodmc/GriefDefender.git synced 2025-02-13 01:21:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Allow DynmapProvider to hide claim's by UUID.

Browse Source
This commit is contained in:
bloodshot 2020-01-03 00:56:13 -05:00
parent c61b0fc1bc
commit 6169644109
2 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bukkit/src/main/java/com/griefdefender/configuration/category/DynmapCategory.java
View File

@ -53,9 +53,6 @@ public class DynmapCategory {
@Setting("hidden-regions")
public List<String> hiddenRegions = new ArrayList<>();
@Setting("visible-regions")
public List<String> visibleRegions = new ArrayList<>();
@Setting("info-window-basic")
public String infoWindowBasic = "<div class=\"infowindow\">"
+ "Name: <span style=\"font-weight:bold;\">%claimname%</span><br/>"

14
bukkit/src/main/java/com/griefdefender/provider/DynmapProvider.java
View File

@ -174,16 +174,10 @@ private String getWindowInfo(Claim claim, AreaMarker marker) {
return info;
}
private boolean isVisible(String owner, String worldname) {
if (!this.cfg.visibleRegions.isEmpty()) {
if (!this.cfg.visibleRegions.contains(owner) && !this.cfg.visibleRegions.contains("world:" + worldname)
&& !this.cfg.visibleRegions.contains(worldname + "/" + owner)) {
return false;
}
}
private boolean isVisible(GDClaim claim, String owner, String worldname) {
if (!this.cfg.hiddenRegions.isEmpty()) {
if (this.cfg.hiddenRegions.contains(owner) || this.cfg.hiddenRegions.contains("world:" + worldname)
|| this.cfg.hiddenRegions.contains(worldname + "/" + owner))
if (this.cfg.hiddenRegions.contains(claim.getUniqueId().toString()) || this.cfg.hiddenRegions.contains(owner) ||
this.cfg.hiddenRegions.contains("world:" + worldname) || this.cfg.hiddenRegions.contains(worldname + "/" + owner))
return false;
}
return true;
@ -231,7 +225,7 @@ private void updateClaimMarker(Claim claim, Map<String, AreaMarker> markerMap) {
}
final String worldName = world.getName();
final String owner = ((GDClaim) claim).getOwnerFriendlyName();
if (isVisible(owner, worldName)) {
if (isVisible((GDClaim) claim, owner, worldName)) {
final Vector3i lesserPos = claim.getLesserBoundaryCorner();
final Vector3i greaterPos = claim.getGreaterBoundaryCorner();
final double[] x = new double[4];