Merge branch 'develop' into pathfinding

js/foundry_imports.js

@@ -168,7 +168,7 @@ export function measure(destination, options={}) {
 
 	this.dragRulerRemovePathfindingWaypoints();
 
-	if (isToken && isPathfindingEnabled()) {
+	if (isToken && isPathfindingEnabled.call(this)) {
 		const from = getGridPositionFromPixelsObj(this.waypoints[this.waypoints.length - 1]);
 		const to = getGridPositionFromPixelsObj(destination);
 		let path = findPath(from, to, this.draggedEntity, this.waypoints);

js/pathfinding.js

@@ -11,6 +11,8 @@ let use5105 = false;
 let gridlessPathfinder = undefined;
 
 export function isPathfindingEnabled() {
+	if (this.user !== game.user)
+		return false;
 	if (!game.user.isGM && !game.settings.get(settingsKey, "allowPathfinding"))
 		return false;
 	return game.settings.get(settingsKey, "autoPathfinding") != togglePathfinding;
@@ -56,7 +58,7 @@ function getNode(pos, token, initialize=true) {
 	if (!cachedNodes[pos.layer])
 		cachedNodes[pos.layer] = new Array(Math.ceil(canvas.dimensions.height / canvas.grid.h));
 	if (!cachedNodes[pos.layer][pos.y])
-	cachedNodes[pos.layer][pos.y] = new Array(Math.ceil(canvas.dimensions.width / canvas.grid.w));
+		cachedNodes[pos.layer][pos.y] = new Array(Math.ceil(canvas.dimensions.width / canvas.grid.w));
 	if (!cachedNodes[pos.layer][pos.y][pos.x]) {
 		cachedNodes[pos.layer][pos.y][pos.x] = pos;
 	}

js/settings.js

@@ -97,7 +97,7 @@ export function registerSettings() {
 		name: "drag-ruler.settings.autoPathfinding.name",
 		hint: "drag-ruler.settings.autoPathfinding.hint",
 		scpoe: "client",
-		config: early_isGM(),
+		config: early_isGM() || game.settings.get(settingsKey, "allowPathfinding"),
 		type: Boolean,
 		defualt: false,
 	});