konsthol/shattered-pixel-dungeon-web-port
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

v0.6.0: fixed interrupts setting time to positive infinity

Browse Source
This commit is contained in:
Evan Debenham
2017-06-01 11:34:54 -04:00
parent 6195a70ed7
commit a222ec64f7
1 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/Actor.java
+9 -11
View File
@@ -181,20 +181,18 @@ public abstract class Actor implements Bundlable {
now = Float.MAX_VALUE; now = Float.MAX_VALUE;
current = null; current = null;
if (!interrupted) { for (Actor actor : all) {
for (Actor actor : all) {
//some actors will always go before others if time is equal.
//some actors will always go before others if time is equal. if (actor.time < now ||
if (actor.time < now || actor.time == now && (current == null || actor.actPriority < current.actPriority)) {
actor.time == now && (current == null || actor.actPriority < current.actPriority)) { now = actor.time;
now = actor.time; current = actor;
current = actor;
}
} }
} }
if (current != null) { if (!interrupted && current != null) {
Actor acting = current; Actor acting = current;