diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/AscensionChallenge.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/AscensionChallenge.java index 5525f1ca3..03f9d57e4 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/AscensionChallenge.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/AscensionChallenge.java @@ -137,6 +137,7 @@ public class AscensionChallenge extends Buff { if (enemy instanceof Ratmogrify.TransmogRat){ enemy = ((Ratmogrify.TransmogRat) enemy).getOriginal(); + if (enemy == null) return; } //only enemies that are boosted count diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/abilities/Ratmogrify.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/abilities/Ratmogrify.java index b07d7ec01..6ea8526c6 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/abilities/Ratmogrify.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/abilities/Ratmogrify.java @@ -213,9 +213,10 @@ public class Ratmogrify extends ArmorAbility { } public Mob getOriginal(){ - original.HP = HP; - original.pos = pos; - original.clearTime(); + if (original != null) { + original.HP = HP; + original.pos = pos; + } return original; } @@ -224,9 +225,8 @@ public class Ratmogrify extends ArmorAbility { @Override protected boolean act() { if (timeLeft <= 0){ - original.HP = HP; - original.pos = pos; - original.clearTime(); + Mob original = getOriginal(); + this.original = null; GameScene.add(original); EXP = 0;