Add support for marker set persistence, prevent add to non persistent

gbl · Aug 12, 2020 · 252f9af · 252f9af
1 parent 7e38c4e
commit 252f9af
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 4 deletions.
diff --git a/DynmapCore/src/main/java/org/dynmap/markers/impl/MarkerAPIImpl.java b/DynmapCore/src/main/java/org/dynmap/markers/impl/MarkerAPIImpl.java
@@ -1394,6 +1394,11 @@ else if((x != null) && (y != null) && (z != null) && (world != null)) {
                 sender.sendMessage("Error: invalid set - " + setid);
                 return true;
             }
+            // Prevent adding persistent markers to a non-persistent set
+            if (!set.isMarkerSetPersistent()) {
+            	sender.sendMessage("Error: cannot add to non-persistent marker set - set is likely plugin owned");
+                return true;
+            }
             MarkerIcon ico = null;
             if(iconid == null) {
                 ico = set.getDefaultMarkerIcon();
@@ -1932,6 +1937,9 @@ private static boolean processListSet(DynmapCore plugin, DynmapCommandSender sen
             if (set.getMaxZoom() >= 0) {
                 msg += ", maxzoom:" + set.getMaxZoom();
             }
+            if (set.isMarkerSetPersistent()) {
+            	msg += ", persistent=true";
+            }
             sender.sendMessage(msg);
         }
         return true;
@@ -2193,6 +2201,11 @@ private static boolean processAddArea(DynmapCore plugin, DynmapCommandSender sen
             sender.sendMessage("Error: invalid set - " + setid);
             return true;
         }
+        // Prevent adding persistent markers to a non-persistent set
+        if (!set.isMarkerSetPersistent()) {
+        	sender.sendMessage("Error: cannot add to non-persistent marker set - set is likely plugin owned");
+            return true;
+        }
         /* Make coord list */
         double[] xx = new double[ll.size()];
         double[] zz = new double[ll.size()];
@@ -2395,6 +2408,11 @@ private static boolean processAddLine(DynmapCore plugin, DynmapCommandSender sen
             sender.sendMessage("Error: invalid set - " + setid);
             return true;
         }
+        // Prevent adding persistent markers to a non-persistent set
+        if (!set.isMarkerSetPersistent()) {
+        	sender.sendMessage("Error: cannot add to non-persistent marker set - set is likely plugin owned");
+            return true;
+        }
         /* Make coord list */
         double[] xx = new double[ll.size()];
         double[] yy = new double[ll.size()];
@@ -2611,7 +2629,11 @@ else if((x != null) && (y != null) && (z != null) && (world != null)) {
             sender.sendMessage("Error: invalid set - " + setid);
             return true;
         }
-
+        // Prevent adding persistent markers to a non-persistent set
+        if (!set.isMarkerSetPersistent()) {
+        	sender.sendMessage("Error: cannot add to non-persistent marker set - set is likely plugin owned");
+            return true;
+        }        
         /* Make circle marker */
         CircleMarker m = set.createCircleMarker(id, label, "true".equals(markup), loc.world, loc.x, loc.y, loc.z, 1, 1, true);
         if(m == null) {

diff --git a/...-helper-116/src/main/java/org/dynmap/bukkit/helper/v116/BukkitVersionHelperSpigot116.java b/...-helper-116/src/main/java/org/dynmap/bukkit/helper/v116/BukkitVersionHelperSpigot116.java
@@ -22,7 +22,7 @@
 import org.dynmap.bukkit.helper.BukkitVersionHelperCB;
 import org.dynmap.bukkit.helper.BukkitVersionHelperGeneric;
 import org.dynmap.bukkit.helper.BukkitWorld;
-import org.dynmap.bukkit.helper.v116.MapChunkCache115;
+import org.dynmap.bukkit.helper.v116.MapChunkCache116;
 import org.dynmap.renderer.DynmapBlockState;
 import org.dynmap.utils.MapChunkCache;
 import org.dynmap.utils.Polygon;
@@ -141,7 +141,7 @@ public void initializeBlockStates() {
      */
     @Override
     public MapChunkCache getChunkCache(BukkitWorld dw, List<DynmapChunk> chunks) {
-        MapChunkCache115 c = new MapChunkCache115();
+        MapChunkCache116 c = new MapChunkCache116();
         c.setChunks(dw, chunks);
         return c;
     }

diff --git a/.../bukkit/helper/v116/MapChunkCache115.java → .../bukkit/helper/v116/MapChunkCache116.java b/.../bukkit/helper/v116/MapChunkCache115.java → .../bukkit/helper/v116/MapChunkCache116.java
@@ -32,7 +32,7 @@
 /**
  * Container for managing chunks - dependent upon using chunk snapshots, since rendering is off server thread
  */
-public class MapChunkCache115 extends AbstractMapChunkCache {
+public class MapChunkCache116 extends AbstractMapChunkCache {
 
 	public static class NBTSnapshot implements Snapshot {
 	    private static interface Section {