Fix Drawing ID not unique on shape.draw() - Mk II

src/main/java/net/rptools/maptool/client/functions/ShapeFunctions.java

@@ -522,6 +522,8 @@ private Object drawShape(
       throw new ParserException(I18N.getText(OBJECT_NOT_FOUND, functionName, shapeName));
     }
     ShapeDrawable shapeDrawable = CACHED_SHAPES.get(shapeName);
+    shapeDrawable.setId(
+        new GUID()); // this gives the drawn element a separate ID to the cached shape
     Rectangle bounds = shapeDrawable.getBounds();
 
     /* Sanity checks */

src/main/java/net/rptools/maptool/model/drawing/AbstractDrawing.java

@@ -46,8 +46,7 @@ protected AbstractDrawing(GUID id) {
   }
 
   protected AbstractDrawing(AbstractDrawing other) {
-    // The only thing we don't preserve is the ID.
-    this.id = new GUID();
+    this.id = other.id;
     this.layer = other.layer;
     this.name = other.name;
   }