diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/armor/ClassArmor.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/armor/ClassArmor.java index f94df4c0b..ebd529024 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/armor/ClassArmor.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/armor/ClassArmor.java @@ -292,7 +292,9 @@ abstract public class ClassArmor extends Armor { public boolean attachTo( Char target ) { if (super.attachTo( target )) { //if we're loading in and the hero has partially spent a turn, delay for 1 turn - if (now() == 0 && cooldown() == 0 && target.cooldown() > 0) spend(TICK); + if (target instanceof Hero && Dungeon.hero == null && cooldown() == 0 && target.cooldown() > 0) { + spend(TICK); + } return true; } return false; diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/Artifact.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/Artifact.java index d41f18fe9..c59a27d63 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/Artifact.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/Artifact.java @@ -220,7 +220,9 @@ public class Artifact extends KindofMisc { public boolean attachTo( Char target ) { if (super.attachTo( target )) { //if we're loading in and the hero has partially spent a turn, delay for 1 turn - if (now() == 0 && cooldown() == 0 && target.cooldown() > 0) spend(TICK); + if (target instanceof Hero && Dungeon.hero == null && cooldown() == 0 && target.cooldown() > 0) { + spend(TICK); + } return true; } return false; diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/rings/Ring.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/rings/Ring.java index e8c52e35c..3e03e1620 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/rings/Ring.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/rings/Ring.java @@ -344,7 +344,9 @@ public class Ring extends KindofMisc { public boolean attachTo( Char target ) { if (super.attachTo( target )) { //if we're loading in and the hero has partially spent a turn, delay for 1 turn - if (now() == 0 && cooldown() == 0 && target.cooldown() > 0) spend(TICK); + if (target instanceof Hero && Dungeon.hero == null && cooldown() == 0 && target.cooldown() > 0) { + spend(TICK); + } return true; } return false; diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/Wand.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/Wand.java index ffc87f5f6..54bee7548 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/Wand.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/Wand.java @@ -680,7 +680,9 @@ public abstract class Wand extends Item { public boolean attachTo( Char target ) { if (super.attachTo( target )) { //if we're loading in and the hero has partially spent a turn, delay for 1 turn - if (now() == 0 && cooldown() == 0 && target.cooldown() > 0) spend(TICK); + if (target instanceof Hero && Dungeon.hero == null && cooldown() == 0 && target.cooldown() > 0) { + spend(TICK); + } return true; } return false;