From 861cbeb587b70f7ebf7d7d9b17fed6e33862e7d4 Mon Sep 17 00:00:00 2001
From: ckcz123 <ckcz123@126.com>
Date: Mon, 2 Aug 2021 10:38:28 +0800
Subject: [PATCH] Fix block.event.event

---
 libs/events.js | 2 +-
 libs/maps.js   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/libs/events.js b/libs/events.js
index ba9b29f5..4b0a96c3 100644
--- a/libs/events.js
+++ b/libs/events.js
@@ -665,7 +665,7 @@ events.prototype._canGetNextItem = function (direction) {
     var nx = core.getHeroLoc('x') + core.utils.scan[direction].x;
     var ny = core.getHeroLoc('y') + core.utils.scan[direction].y;
     var block = core.getBlock(nx, ny);
-    return block != null && !block.event.script && block.event.trigger == 'getItem';
+    return block != null && !block.event.script && !block.event.event && block.event.trigger == 'getItem';
 }
 
 events.prototype._getNextItem = function (direction, noRoute) {
diff --git a/libs/maps.js b/libs/maps.js
index 58343b76..6dc10ee5 100644
--- a/libs/maps.js
+++ b/libs/maps.js
@@ -856,7 +856,7 @@ maps.prototype._canMoveDirectly_checkNextPoint = function (blocksObj, x, y) {
     var index = x + "," + y;
     var block = blocksObj[index];
     // 该点是否不可通行或有脚本
-    if (block && !block.disable && (block.event.noPass || block.event.script))
+    if (block && !block.disable && (block.event.noPass || block.event.script || block.event.event))
         return false;
     // 该点是否是绿点可触发
     if (block && !block.disable && block.event.trigger) {
@@ -1032,7 +1032,7 @@ maps.prototype._drawBlockInfo_shouldBlurFg = function (x, y) {
     if (main.mode == 'play' && !core.flags.blurFg) return false;
     var block = this.getBlock(x, y);
     if (block == null || block.id == 0) return false;
-    if (block.event.cls == 'autotile' || block.event.cls == 'tileset') return block.event.script;
+    if (block.event.cls == 'autotile' || block.event.cls == 'tileset') return block.event.script || block.event.event;
     return true;
 }