diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/WaterOfAwareness.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/WaterOfAwareness.java index 8029ec6c9..1e3ffdd2b 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/WaterOfAwareness.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/WaterOfAwareness.java @@ -73,7 +73,7 @@ public class WaterOfAwareness extends WellWater { } @Override - protected Item affectItem( Item item ) { + protected Item affectItem( Item item, int pos ) { if (item.isIdentified()) { return null; } else { diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/WaterOfHealth.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/WaterOfHealth.java index f14fdba14..b6344220c 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/WaterOfHealth.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/WaterOfHealth.java @@ -53,7 +53,7 @@ public class WaterOfHealth extends WellWater { hero.belongings.uncurseEquipped(); ((Hunger)hero.buff( Hunger.class )).satisfy( Hunger.STARVING ); - CellEmitter.get( pos ).start( ShaftParticle.FACTORY, 0.2f, 3 ); + CellEmitter.get( hero.pos ).start( ShaftParticle.FACTORY, 0.2f, 3 ); Dungeon.hero.interrupt(); @@ -63,7 +63,7 @@ public class WaterOfHealth extends WellWater { } @Override - protected Item affectItem( Item item ) { + protected Item affectItem( Item item, int pos ) { if (item instanceof DewVial && !((DewVial)item).isFull()) { ((DewVial)item).fill(); return item; diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/WaterOfTransmutation.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/WaterOfTransmutation.java index f799fb7ae..384e3e130 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/WaterOfTransmutation.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/WaterOfTransmutation.java @@ -48,7 +48,7 @@ import com.watabou.utils.Random; public class WaterOfTransmutation extends WellWater { @Override - protected Item affectItem( Item item ) { + protected Item affectItem( Item item, int pos ) { if (item instanceof MagesStaff) { item = changeStaff( (MagesStaff)item ); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/WellWater.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/WellWater.java index 25ba8c09b..c93e7882c 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/WellWater.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/WellWater.java @@ -34,8 +34,6 @@ import com.watabou.utils.Random; public abstract class WellWater extends Blob { - protected int pos; - @Override protected void evolve() { int cell; @@ -71,7 +69,7 @@ public abstract class WellWater extends Blob { } else if ((heap = Dungeon.level.heaps.get( pos )) != null) { Item oldItem = heap.peek(); - Item newItem = affectItem( oldItem ); + Item newItem = affectItem( oldItem, pos ); if (newItem != null) { @@ -112,7 +110,7 @@ public abstract class WellWater extends Blob { protected abstract boolean affectHero( Hero hero ); - protected abstract Item affectItem( Item item ); + protected abstract Item affectItem( Item item, int pos ); protected abstract Notes.Landmark record();