X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavedroid%2Fgame%2Fworld%2FGameFluidsThread.java;h=c5eb8337b3810636f04efbe3a0126e1f1f142184;hb=8305b3380d9a31acbba43df1d52a7bca8c775bc9;hp=570b2c191fbd359f543e74b9a28255b6b516acbb;hpb=2aa65a4cdb47df8014f28342d460fc6639bed885;p=cavedroid.git

diff --git a/core/src/ru/deadsoftware/cavedroid/game/world/GameFluidsThread.java b/core/src/ru/deadsoftware/cavedroid/game/world/GameFluidsThread.java
index 570b2c1..c5eb833 100644
--- a/core/src/ru/deadsoftware/cavedroid/game/world/GameFluidsThread.java
+++ b/core/src/ru/deadsoftware/cavedroid/game/world/GameFluidsThread.java
@@ -1,15 +1,15 @@
 package ru.deadsoftware.cavedroid.game.world;
 
-import com.badlogic.gdx.utils.TimeUtils;
 import ru.deadsoftware.cavedroid.game.mobs.MobsController;
 
 import java.util.Arrays;
+import java.util.TimerTask;
 
 import static ru.deadsoftware.cavedroid.game.GameItems.*;
 
-class GameFluidsThread extends Thread {
+class GameFluidsThread extends TimerTask {
 
-    private static final int FLUID_UPDATE_INTERVAL_MS = 100;
+    public static final int FLUID_UPDATE_INTERVAL_MS = 100;
     private static final int FLUID_STATES = 5;
 
     private static final int[] WATER_IDS = {8, 60, 61, 62, 63};
@@ -20,14 +20,10 @@ class GameFluidsThread extends Thread {
     private final GameWorld mGameWorld;
     private final MobsController mMobsController;
 
-    private final Thread mMainThread;
-
     GameFluidsThread(GameWorld gameWorld,
-                     MobsController mobsController,
-                     Thread mainThread) {
+                     MobsController mobsController) {
         mGameWorld = gameWorld;
         mMobsController = mobsController;
-        mMainThread = mainThread;
     }
 
     private int getBlockState(int id) {
@@ -134,20 +130,8 @@ class GameFluidsThread extends Thread {
         }
     }
 
-    private boolean timeToUpdate() {
-        if (TimeUtils.timeSinceMillis(mFluidLastUpdateTimestamp) >= FLUID_UPDATE_INTERVAL_MS) {
-            mFluidLastUpdateTimestamp = TimeUtils.millis();
-            return true;
-        }
-        return false;
-    }
-
     @Override
     public void run() {
-        while (!this.isInterrupted() && mMainThread.isAlive()) {
-            if (timeToUpdate()) {
-                fluidUpdater();
-            }
-        }
+        fluidUpdater();
     }
 }