Merge branch 'develop' into pathfinding

2022-02-09 11:00:08 +01:00
parent f5b0e145ac 22112ddfd5
commit 0ccfc6ef2f
7 changed files with 42 additions and 3 deletions
@@ -61,6 +61,9 @@ export function extendRuler() {

 		measure(destination, options={}) {
 			if (this.isDragRuler) {
+				// If this is the ruler of a remote user take the waypoints as they were transmitted and don't apply any additional snapping to them
+				if (this.user !== game.user)
+					options.snap = false;
 				return measure.call(this, destination, options);
 			}
 			else {
@@ -199,6 +202,12 @@ export function extendRuler() {
 			if (measureImmediately)
 				ruler.measure(destination, options);
 		}
+
+		dragRulerSendState() {
+			game.user.broadcastActivity({
+				ruler: this.toJSON()
+			});
+		}
 	}

 	Ruler = DragRulerRuler;