summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--rules.js1
-rw-r--r--ui.js3
2 files changed, 3 insertions, 1 deletions
diff --git a/rules.js b/rules.js
index 403ca04..0adffaa 100644
--- a/rules.js
+++ b/rules.js
@@ -872,6 +872,7 @@ function can_block_muster_via(who, from, next, muster) {
return true;
}
}
+ return false;
}
function can_block_muster(who, muster) {
diff --git a/ui.js b/ui.js
index ea170cb..779cbf0 100644
--- a/ui.js
+++ b/ui.js
@@ -132,7 +132,8 @@ function on_blur_map_block(evt) {
function on_click_map_block(evt) {
let b = evt.target.block;
- send_action('block', b);
+ if (!game.battle)
+ send_action('block', b);
}
function is_battle_reserve(who, list) {