From 1d85fdd75cf16cbae07ddfa47d1637cd00f433f2 Mon Sep 17 00:00:00 2001
From: Mike Primm <mike@primmhome.com>
Date: Mon, 21 Nov 2011 00:02:42 +0800
Subject: [PATCH 1/3] Fix reporting of label markup and description in update
 events

---
 src/main/java/org/dynmap/markers/impl/MarkerAPIImpl.java     | 4 ++++
 src/main/java/org/dynmap/markers/impl/MarkerSignManager.java | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/dynmap/markers/impl/MarkerAPIImpl.java b/src/main/java/org/dynmap/markers/impl/MarkerAPIImpl.java
index a915dc10..3453835a 100644
--- a/src/main/java/org/dynmap/markers/impl/MarkerAPIImpl.java
+++ b/src/main/java/org/dynmap/markers/impl/MarkerAPIImpl.java
@@ -78,6 +78,8 @@ public class MarkerAPIImpl implements MarkerAPI, Event.Listener<DynmapWorld> {
         public String label;
         public String icon;
         public String set;
+        public boolean markup;
+        public String desc;
         
         public MarkerUpdated(Marker m, boolean deleted) {
             this.id = m.getMarkerID();
@@ -87,6 +89,8 @@ public class MarkerAPIImpl implements MarkerAPI, Event.Listener<DynmapWorld> {
             this.z = m.getZ();
             this.set = m.getMarkerSet().getMarkerSetID();
             this.icon = m.getMarkerIcon().getMarkerIconID();
+            this.markup = m.isLabelMarkup();
+            this.desc = m.getDescription();
             if(deleted) 
                 msg = "markerdeleted";
             else
diff --git a/src/main/java/org/dynmap/markers/impl/MarkerSignManager.java b/src/main/java/org/dynmap/markers/impl/MarkerSignManager.java
index 44ac01fc..101950ba 100644
--- a/src/main/java/org/dynmap/markers/impl/MarkerSignManager.java
+++ b/src/main/java/org/dynmap/markers/impl/MarkerSignManager.java
@@ -75,7 +75,7 @@ public class MarkerSignManager {
                 Marker marker = ms.findMarker(id);
                 /* If exists, update it */
                 if(marker != null) {
-                    marker.setLabel(label);
+                    marker.setLabel(label, true);
                     marker.setMarkerIcon(mi);
                 }
                 else {  /* Make new marker */

From 7f631379aaa9816bf6d461710cf90f1f818bd6f3 Mon Sep 17 00:00:00 2001
From: Mike Primm <mike@primmhome.com>
Date: Mon, 21 Nov 2011 12:37:02 +0800
Subject: [PATCH 2/3] Fix area markers being left around after world changes

---
 web/js/markers.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/web/js/markers.js b/web/js/markers.js
index d89e62f2..c93d32e4 100644
--- a/web/js/markers.js
+++ b/web/js/markers.js
@@ -10,6 +10,10 @@ componentconstructors['markers'] = function(dynmap, configuration) {
 				set.layergroup.removeLayer(marker.our_marker);
 			});
 			set.markers = {};
+			$.each(set.areas, function(aname, area) {
+				set.layergroup.removeLayer(area.our_area);
+			});
+			set.areas = {};			
 		});
 	}
 			

From 43b7f222851c76cde25095e86ba8ce4c3ff19535 Mon Sep 17 00:00:00 2001
From: Mike Primm <mike@primmhome.com>
Date: Mon, 21 Nov 2011 13:51:52 +0800
Subject: [PATCH 3/3] Switch to new Bukkit versioning - 1.0.0-R1-SNAPSHOT

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 696ca9b6..a8e4996b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -96,7 +96,7 @@
   	<dependency>
   	  <groupId>org.bukkit</groupId>
   	  <artifactId>bukkit</artifactId>
-  	  <version>0.0.1-SNAPSHOT</version>
+  	  <version>1.0.0-R1-SNAPSHOT</version>
   	  <type>jar</type>
       <scope>compile</scope>
   	</dependency>