Nonnull by default

[cavedroid.git] / core / src / ru / deadsoftware / cavedroid / game / mobs / FallingGravel.java

diff --git a/core/src/ru/deadsoftware/cavedroid/game/mobs/FallingGravel.java b/core/src/ru/deadsoftware/cavedroid/game/mobs/FallingGravel.java
index 850f8dd073823f4678d05eb61850765050b9185d..c46def34abd58598d3655979ed25fbd6e2c6c32f 100644 (file)
--- a/core/src/ru/deadsoftware/cavedroid/game/mobs/FallingGravel.java
+++ b/core/src/ru/deadsoftware/cavedroid/game/mobs/FallingGravel.java
@@ -2,9 +2,10 @@ package ru.deadsoftware.cavedroid.game.mobs;
 
 import com.badlogic.gdx.graphics.g2d.SpriteBatch;
 import com.badlogic.gdx.math.Vector2;
-import org.jetbrains.annotations.NotNull;
 import ru.deadsoftware.cavedroid.misc.Assets;
 
+import static ru.deadsoftware.cavedroid.GameScreen.GP;
+
 /**
  * Falling gravel is actually a mob, that spawns in place of gravel when there is no block under it,
  * falls down to the next block and becomes a block of gravel again.
@@ -17,12 +18,16 @@ public class FallingGravel extends Mob {
      * @param y Y in pixels
      */
     public FallingGravel(float x, float y) {
-        super(x, y, 16, 16, 0);
-        mov = new Vector2(0, 1);
+        super(x, y, 16, 16, Direction.LEFT, Type.GRAVEL);
+        move = new Vector2(0, 1);
     }
 
     @Override
     public void ai() {
+        if (move.isZero()) {
+            GP.world.setForeMap(getMapX(), getMiddleMapY(), 11);
+            kill();
+        }
     }
 
     @Override
@@ -30,13 +35,8 @@ public class FallingGravel extends Mob {
     }
 
     @Override
-    public void draw(@NotNull SpriteBatch spriteBatch, float x, float y) {
+    public void draw(SpriteBatch spriteBatch, float x, float y) {
         spriteBatch.draw(Assets.gravelSprite, x, y);
     }
 
-    @Override
-    public int getType() {
-        return 11;
-    }
-
 }