From 3bbd5e523b345cf5b281c4fde0967b22e0e7979c Mon Sep 17 00:00:00 2001
From: oc <ckcz123@126.com>
Date: Sat, 22 Sep 2018 19:45:18 +0800
Subject: [PATCH] Fix cannotMove

---
 libs/control.js | 2 +-
 libs/events.js  | 1 +
 libs/maps.js    | 8 +++++++-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/libs/control.js b/libs/control.js
index 3993a827..62a043f5 100644
--- a/libs/control.js
+++ b/libs/control.js
@@ -1954,7 +1954,7 @@ control.prototype.replay = function () {
         return;
     }
     else if (action=='getNext') {
-        if (core.flags.enableGentleClick && core.getBlock(core.nextX(), core.nextY())!=null) {
+        if (core.flags.enableGentleClick && core.canMoveHero() && core.getBlock(core.nextX(), core.nextY())!=null) {
             var nextX = core.nextX(), nextY = core.nextY();
             var block = core.getBlock(nextX, nextY);
             if (block!=null && block.block.event.trigger=='getItem') {
diff --git a/libs/events.js b/libs/events.js
index 0eca9ad7..7db2f468 100644
--- a/libs/events.js
+++ b/libs/events.js
@@ -1003,6 +1003,7 @@ events.prototype.insertAction = function (action, x, y, callback) {
 ////// 获得面前的物品（轻按） //////
 events.prototype.getNextItem = function() {
     if (!core.status.heroStop || !core.flags.enableGentleClick) return;
+    if (!core.canMoveHero()) return;
     var nextX = core.nextX(), nextY = core.nextY();
     var block = core.getBlock(nextX, nextY);
     if (block==null) return;
diff --git a/libs/maps.js b/libs/maps.js
index 69c138d7..f2490d4a 100644
--- a/libs/maps.js
+++ b/libs/maps.js
@@ -310,11 +310,17 @@ maps.prototype.canMoveDirectly = function (destX,destY) {
     visited[fromX+core.bigmap.width*fromY]=0;
     queue.push(fromX+core.bigmap.width*fromY);
 
-    var directions = [[-1,0],[1,0],[0,1],[0,-1]];
+    var directions = {
+        "left": [-1,0],
+        "up": [0,-1],
+        "right": [1,0],
+        "down": [0,1]
+    }
     while (queue.length>0) {
         var now=queue.shift(), nowX=parseInt(now%core.bigmap.width), nowY=parseInt(now/core.bigmap.width);
 
         for (var dir in directions) {
+            if (!core.canMoveHero(nowX, nowY, dir)) continue;
             var nx=nowX+directions[dir][0], ny=nowY+directions[dir][1];
             if (nx<0||nx>=core.bigmap.width||ny<0||ny>=core.bigmap.height||visited[nx+core.bigmap.width*ny]||core.getBlock(nx,ny)!=null||core.status.checkBlock.damage[nx+core.bigmap.width*ny]>0) continue;
             visited[nx+core.bigmap.width*ny]=visited[nowX+core.bigmap.width*nowY]+1;