3 files changed, 14 insertions, 1 deletions

@@ -50,6 +50,11 @@ public abstract class AbstractEvent implements Event {
         
         setDirection(toMove);
         
+        if (getDirection() != toMove)
+        {
+            return false;
+        }
+        
         if (!getParentMap().checkForCollision(this, toMove))
         {
             setAnimationStep(2);
@@ -9,7 +9,6 @@ import com.fourisland.fourpuzzle.Layer;
 import java.awt.Graphics;
 import java.util.ArrayList;
 import com.fourisland.fourpuzzle.Direction;
-import com.fourisland.fourpuzzle.gamestate.mapview.Map;
 import com.fourisland.fourpuzzle.gamestate.mapview.event.graphic.BlankEventGraphic;
 
 /**
@@ -36,6 +36,15 @@ public class MoveEventThread implements Runnable {
 
     public void run()
     {
+        while (ev.isMoving())
+        {
+            try {
+                Thread.sleep(2);
+            } catch (InterruptedException ex) {
+                Logger.getLogger(MoveEventThread.class.getName()).log(Level.SEVERE, null, ex);
+            }
+        }
+        
         events.add(ev);
         
         MoveEventThread.countMoveEventThreads++;