Upstream/dynmap
1
0
Fork 0
mirror of https://github.com/webbukkit/dynmap.git synced 2024-11-24 19:25:15 +01:00
Code Issues Projects Releases Wiki Activity

Fix reporting of label markup and description in update events

Browse Source
This commit is contained in:
Mike Primm 2011-11-21 00:02:42 +08:00 committed by mikeprimm
parent e986ab4bfb
commit 1d85fdd75c
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -78,6 +78,8 @@ public class MarkerAPIImpl implements MarkerAPI, Event.Listener<DynmapWorld> {
public String label; public String label;
public String icon; public String icon;
public String set; public String set;
public boolean markup;
public String desc;
public MarkerUpdated(Marker m, boolean deleted) { public MarkerUpdated(Marker m, boolean deleted) {
this.id = m.getMarkerID(); this.id = m.getMarkerID();
@ -87,6 +89,8 @@ public class MarkerAPIImpl implements MarkerAPI, Event.Listener<DynmapWorld> {
this.z = m.getZ(); this.z = m.getZ();
this.set = m.getMarkerSet().getMarkerSetID(); this.set = m.getMarkerSet().getMarkerSetID();
this.icon = m.getMarkerIcon().getMarkerIconID(); this.icon = m.getMarkerIcon().getMarkerIconID();
this.markup = m.isLabelMarkup();
this.desc = m.getDescription();
if(deleted) if(deleted)
msg = "markerdeleted"; msg = "markerdeleted";
else else

2
src/main/java/org/dynmap/markers/impl/MarkerSignManager.java
View File

@ -75,7 +75,7 @@ public class MarkerSignManager {
Marker marker = ms.findMarker(id); Marker marker = ms.findMarker(id);
/* If exists, update it */ /* If exists, update it */
if(marker != null) { if(marker != null) {
marker.setLabel(label); marker.setLabel(label, true);
marker.setMarkerIcon(mi); marker.setMarkerIcon(mi);
} }
else { /* Make new marker */ else { /* Make new marker */