Upstream/dynmap
1
0
Fork 0
mirror of https://github.com/webbukkit/dynmap.git synced 2024-11-30 14:13:38 +01:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Mike Primm 2020-08-12 10:08:36 -05:00
parent 7e38c4ef23
commit 252f9afcdb
3 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
DynmapCore/src/main/java/org/dynmap/markers/impl/MarkerAPIImpl.java
View File

@ -1394,6 +1394,11 @@ public class MarkerAPIImpl implements MarkerAPI, Event.Listener<DynmapWorld> {
sender.sendMessage("Error: invalid set - " + setid); sender.sendMessage("Error: invalid set - " + setid);
return true; 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; MarkerIcon ico = null;
if(iconid == null) { if(iconid == null) {
ico = set.getDefaultMarkerIcon(); ico = set.getDefaultMarkerIcon();
@ -1932,6 +1937,9 @@ public class MarkerAPIImpl implements MarkerAPI, Event.Listener<DynmapWorld> {
if (set.getMaxZoom() >= 0) { if (set.getMaxZoom() >= 0) {
msg += ", maxzoom:" + set.getMaxZoom(); msg += ", maxzoom:" + set.getMaxZoom();
} }
if (set.isMarkerSetPersistent()) {
msg += ", persistent=true";
}
sender.sendMessage(msg); sender.sendMessage(msg);
} }
return true; return true;
@ -2193,6 +2201,11 @@ public class MarkerAPIImpl implements MarkerAPI, Event.Listener<DynmapWorld> {
sender.sendMessage("Error: invalid set - " + setid); sender.sendMessage("Error: invalid set - " + setid);
return true; 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 */ /* Make coord list */
double[] xx = new double[ll.size()]; double[] xx = new double[ll.size()];
double[] zz = new double[ll.size()]; double[] zz = new double[ll.size()];
@ -2395,6 +2408,11 @@ public class MarkerAPIImpl implements MarkerAPI, Event.Listener<DynmapWorld> {
sender.sendMessage("Error: invalid set - " + setid); sender.sendMessage("Error: invalid set - " + setid);
return true; 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 */ /* Make coord list */
double[] xx = new double[ll.size()]; double[] xx = new double[ll.size()];
double[] yy = new double[ll.size()]; double[] yy = new double[ll.size()];
@ -2611,7 +2629,11 @@ public class MarkerAPIImpl implements MarkerAPI, Event.Listener<DynmapWorld> {
sender.sendMessage("Error: invalid set - " + setid); sender.sendMessage("Error: invalid set - " + setid);
return true; 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 */ /* Make circle marker */
CircleMarker m = set.createCircleMarker(id, label, "true".equals(markup), loc.world, loc.x, loc.y, loc.z, 1, 1, true); CircleMarker m = set.createCircleMarker(id, label, "true".equals(markup), loc.world, loc.x, loc.y, loc.z, 1, 1, true);
if(m == null) { if(m == null) {

4
bukkit-helper-116/src/main/java/org/dynmap/bukkit/helper/v116/BukkitVersionHelperSpigot116.java
View File

@ -22,7 +22,7 @@ import org.dynmap.bukkit.helper.BukkitMaterial;
import org.dynmap.bukkit.helper.BukkitVersionHelperCB; import org.dynmap.bukkit.helper.BukkitVersionHelperCB;
import org.dynmap.bukkit.helper.BukkitVersionHelperGeneric; import org.dynmap.bukkit.helper.BukkitVersionHelperGeneric;
import org.dynmap.bukkit.helper.BukkitWorld; 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.renderer.DynmapBlockState;
import org.dynmap.utils.MapChunkCache; import org.dynmap.utils.MapChunkCache;
import org.dynmap.utils.Polygon; import org.dynmap.utils.Polygon;
@ -141,7 +141,7 @@ public class BukkitVersionHelperSpigot116 extends BukkitVersionHelperGeneric {
*/ */
@Override @Override
public MapChunkCache getChunkCache(BukkitWorld dw, List<DynmapChunk> chunks) { public MapChunkCache getChunkCache(BukkitWorld dw, List<DynmapChunk> chunks) {
MapChunkCache115 c = new MapChunkCache115(); MapChunkCache116 c = new MapChunkCache116();
c.setChunks(dw, chunks); c.setChunks(dw, chunks);
return c; return c;
} }

2
bukkit-helper-116/src/main/java/org/dynmap/bukkit/helper/v116/MapChunkCache115.java → bukkit-helper-116/src/main/java/org/dynmap/bukkit/helper/v116/MapChunkCache116.java
View File

@ -32,7 +32,7 @@ import net.minecraft.server.v1_16_R1.NBTTagList;
/** /**
* Container for managing chunks - dependent upon using chunk snapshots, since rendering is off server thread * 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 { public static class NBTSnapshot implements Snapshot {
private static interface Section { private static interface Section {