From 8220860c68c51189c5bee18007c1abe3e3c57d15 Mon Sep 17 00:00:00 2001
From: ckcz123 <ckcz123@126.com>
Date: Thu, 28 May 2020 20:37:07 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=A2=9D=E5=A4=96=E7=B4=A0?=
 =?UTF-8?q?=E6=9D=90=E5=8F=AF=E9=80=9A=E8=A1=8C=E6=80=A7=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 _server/editor_file.js | 6 +++---
 libs/maps.js           | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/_server/editor_file.js b/_server/editor_file.js
index 2575bc77..981add58 100644
--- a/_server/editor_file.js
+++ b/_server/editor_file.js
@@ -401,7 +401,7 @@ editor_file = function (editor, callback) {
         var mapActions = [];
 
         iconActions.push(["add", "['autotile']['" + filename + "']", 0]);
-        mapActions.push(["add", "['" + idnum + "']", {'cls': 'autotile', 'id': filename, 'noPass': true}]);
+        mapActions.push(["add", "['" + idnum + "']", {'cls': 'autotile', 'id': filename}]);
 
         var templist = [];
         var tempcallback = function (err) {
@@ -575,7 +575,7 @@ editor_file = function (editor, callback) {
                 var value=actionList[ii];
                 // 是tilesets 且未定义 且在这里是第一次定义
                 if(idnum>=editor.core.icons.tilesetStartOffset && !isset(editor.core.maps.blocksInfo[idnum]) && tempmap.indexOf(idnum)===-1){
-                    actionList.splice(ii,0,["add","['" + idnum + "']",{"cls": "tileset", "id": "X"+idnum, "noPass": true}]);
+                    actionList.splice(ii,0,["add","['" + idnum + "']",{"cls": "tileset", "id": "X"+idnum}]);
                     tempmap.push(idnum);
                     ii++;
                 }
@@ -588,7 +588,7 @@ editor_file = function (editor, callback) {
             callback([
                 (function () {
                     var sourceobj=editor.core.maps.blocksInfo[idnum];
-                    if(!isset(sourceobj) && idnum>=editor.core.icons.tilesetStartOffset)sourceobj={"cls": "tileset", "id": "X"+idnum, "noPass": true}
+                    if(!isset(sourceobj) && idnum>=editor.core.icons.tilesetStartOffset)sourceobj={"cls": "tileset", "id": "X"+idnum}
                     var locObj = Object.assign({}, sourceobj);
                     Object.keys(editor.file.comment._data.maps._data).forEach(function (v) {
                         if (!isset(sourceobj[v]))
diff --git a/libs/maps.js b/libs/maps.js
index 54137aeb..9b18679f 100644
--- a/libs/maps.js
+++ b/libs/maps.js
@@ -138,9 +138,9 @@ maps.prototype.initBlock = function (x, y, id, addInfo, eventFloor) {
     var block = {'x': x, 'y': y, 'id': id};
     if (disable != null) block.disable = disable;
 
-    if (id == 17) block.event = {"cls": "terrains", "id": "airwall", "noPass": true, "cannotIn":["up", "down", "left", "right"]};
+    if (id == 17) block.event = {"cls": "terrains", "id": "airwall", "cannotIn":["up", "down", "left", "right"]};
     else if (id in this.blocksInfo) block.event = JSON.parse(JSON.stringify(this.blocksInfo[id]));
-    else if (core.icons.getTilesetOffset(id)) block.event = {"cls": "tileset", "id": "X" + id, "noPass": true};
+    else if (core.icons.getTilesetOffset(id)) block.event = {"cls": "tileset", "id": "X" + id};
     else block.event = {'cls': 'terrains', 'id': 'none', 'noPass': false};
 
     if (block.event.noPass == null) {