From fb70f27695350c5a2d4081c6ca12fc8e3e56044a Mon Sep 17 00:00:00 2001
From: Evan Debenham <Evan.SHPX@gmail.com>
Date: Wed, 6 May 2015 23:48:06 -0400
Subject: [PATCH] v0.3.0: modified pushing to work in sync.
---
.../shatteredpixeldungeon/effects/Pushing.java | 16 ++++++++++------
1 file changed, 10 insertions(+), 6 deletions(-)
diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/effects/Pushing.java b/src/com/shatteredpixel/shatteredpixeldungeon/effects/Pushing.java
index d7af54823..9e504d938 100644
--- a/src/com/shatteredpixel/shatteredpixeldungeon/effects/Pushing.java
+++ b/src/com/shatteredpixel/shatteredpixeldungeon/effects/Pushing.java
@@ -45,13 +45,17 @@ public class Pushing extends Actor {
if (effect == null) {
new Effect();
}
- return false;
-
- } else {
-
- Actor.remove( Pushing.this );
- return true;
}
+
+ Actor.remove( Pushing.this );
+
+ //so that all pushing effects at the same time go simultaneously
+ for ( Actor actor : Actor.all() ){
+ if (actor instanceof Pushing && ((Pushing) actor).cooldown() == 0)
+ return true;
+ }
+ return false;
+
}
public class Effect extends Visual {