From a222ec64f713d794ba7c3c24f4b2bb62d08856a6 Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Thu, 1 Jun 2017 11:34:54 -0400 Subject: [PATCH] v0.6.0: fixed interrupts setting time to positive infinity --- .../shatteredpixeldungeon/actors/Actor.java | 20 +++++++++---------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/Actor.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/Actor.java index f186e8fae..16c1345f9 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/Actor.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/Actor.java @@ -181,20 +181,18 @@ public abstract class Actor implements Bundlable { now = Float.MAX_VALUE; current = null; - if (!interrupted) { - for (Actor actor : all) { - - //some actors will always go before others if time is equal. - if (actor.time < now || - actor.time == now && (current == null || actor.actPriority < current.actPriority)) { - now = actor.time; - current = actor; - } - + for (Actor actor : all) { + + //some actors will always go before others if time is equal. + if (actor.time < now || + actor.time == now && (current == null || actor.actPriority < current.actPriority)) { + now = actor.time; + current = actor; } + } - if (current != null) { + if (!interrupted && current != null) { Actor acting = current;