diff --git a/libs/control.js b/libs/control.js
index c2507578..9fb2e4eb 100644
--- a/libs/control.js
+++ b/libs/control.js
@@ -1683,8 +1683,9 @@ control.prototype._replayAction_getNext = function (action) {
 
 control.prototype._replayAction_moveDirectly = function (action) {
     if (action.indexOf("move:")!=0) return false;
-    // 忽略连续的瞬移事件
-    if (!core.hasFlag('poison')) {
+    // 忽略连续的瞬移事件；如果大地图某一边超过计算范围则不合并
+    if (!core.hasFlag('poison') && core.status.thisMap.width < 2 * core.bigmap.extend + core.__SIZE__
+        && core.status.thisMap.height < 2 * core.bigmap.extend + core.__SIZE__) {
         while (core.status.replay.toReplay.length>0 &&
             core.status.replay.toReplay[0].indexOf('move:')==0) {
                 core.status.route.push(action);
diff --git a/project/functions.js b/project/functions.js
index 87a7c960..8e59f6a7 100644
--- a/project/functions.js
+++ b/project/functions.js
@@ -1340,6 +1340,13 @@ var functions_d6ad677b_427a_4623_b50f_a445a3b0ef8a =
 		}
 	}
 
+	// 取消注释下面这一段可以让护盾抵御阻激夹域伤害
+	/*
+	for (var loc in damage) {
+		damage[loc] = Math.max(0, damage[loc] - core.getRealStatus('mdef'));
+	}
+	*/
+
 	core.flags.canGoDeadZone = canGoDeadZone;
 	core.status.checkBlock = {
 		damage: damage,