From 5747e8eacd242b47e8308eab2f5d23c90366efaf Mon Sep 17 00:00:00 2001
From: Zeno Rogue <zeno@attnam.com>
Date: Sun, 17 Sep 2017 14:00:28 +0200
Subject: [PATCH] fixed some bugs with the activation of Orb of Yendor

---
 game.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/game.cpp b/game.cpp
index a93cfc4c..24ca5dd7 100644
--- a/game.cpp
+++ b/game.cpp
@@ -6448,6 +6448,10 @@ bool movepcto(int d, int subdir, bool checkonly) {
       return false;
       }
 
+    if(c2->item == itOrbYendor && !checkonly && !peace::on && !itemHiddenFromSight(c2) && yendor::check(c2)) {
+      return false;
+      }
+
     if(isWatery(c2) && !nonAdjacentPlayer(cwt.c,c2) && !c2->monst && cwt.c->wall == waBoat) {
 
       if(havePushConflict(cwt.c, checkonly)) return false;
@@ -6712,9 +6716,6 @@ bool movepcto(int d, int subdir, bool checkonly) {
         addMessage("Are you sure you want to step there?");
         return false;
         }
-      if(c2->item == itOrbYendor && !boatmove && !checkonly && !peace::on && yendor::check(c2)) {
-        return false;
-        }
       if(monstersnear(c2, NULL, moPlayer, NULL, cwt.c)) {
         if(checkonly) return false;