Merge remote-tracking branch 'origin/master'

2014-11-24 16:49:13 -05:00
parent 36a0bcbcc5 ccc4588e6a
commit 2ab55e2417
1 changed files with 1 additions and 1 deletions
--- a/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/TalismanOfForesight.java
+++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/TalismanOfForesight.java
@@ -137,7 +137,7 @@ public class TalismanOfForesight extends Artifact {
                }
            }

-            if (smthFound == true || !cursed){
+            if (smthFound == true && !cursed){
                if (warn == 0){
                    GLog.w("You feel uneasy.");
                    if (target instanceof Hero){