From 8b1ffd9a7201d83d351b03401d4d3b22dc0114a1 Mon Sep 17 00:00:00 2001
From: Evan Debenham <Evan@ShatteredPixel.com>
Date: Wed, 4 Feb 2015 01:20:37 -0500
Subject: [PATCH] Merging 1.7.5 Source: items/artifacts changes

---
 .../shatteredpixeldungeon/items/artifacts/DriedRose.java  | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/DriedRose.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/DriedRose.java
index effbf35c0..e08729248 100644
--- a/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/DriedRose.java
+++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/DriedRose.java
@@ -278,7 +278,7 @@ public class DriedRose extends Artifact {
             flying = true;
 
             state = WANDERING;
-            enemy = DUMMY;
+            enemy = null;
 
             ally = true;
         }
@@ -297,7 +297,7 @@ public class DriedRose extends Artifact {
 
         public void saySpawned(){
             int i = (Dungeon.depth - 1) / 5;
-            if (chooseEnemy() == DUMMY)
+            if (chooseEnemy() == null)
                 yell( Random.element( VOICE_AMBIENT[i] ) );
             else
                 yell( Random.element( VOICE_ENEMIES[i][ Dungeon.bossLevel() ? 1 : 0 ] ) );
@@ -352,7 +352,7 @@ public class DriedRose extends Artifact {
 
         @Override
         protected Char chooseEnemy() {
-            if (enemy == DUMMY || !enemy.isAlive() || state == WANDERING) {
+            if (enemy == null || !enemy.isAlive() || state == WANDERING) {
 
                 HashSet<Mob> enemies = new HashSet<Mob>();
                 for (Mob mob : Dungeon.level.mobs) {
@@ -360,7 +360,7 @@ public class DriedRose extends Artifact {
                         enemies.add(mob);
                     }
                 }
-                enemy = enemies.size() > 0 ? Random.element( enemies ) : DUMMY;
+                enemy = enemies.size() > 0 ? Random.element( enemies ) : null;
             }
             return enemy;
         }