Fix crash in craft

[cavedroid.git] / core / src / ru / deadsoftware / cavedroid / game / input / handler / touch / JoystickInputHandler.kt

diff --git a/core/src/ru/deadsoftware/cavedroid/game/input/handler/touch/JoystickInputHandler.kt b/core/src/ru/deadsoftware/cavedroid/game/input/handler/touch/JoystickInputHandler.kt
index c175f31da86ba167d1b11a2daaaf13446585acbe..1c020a5c189bd982493cd21b46f49c6687b62224 100644 (file)
--- a/core/src/ru/deadsoftware/cavedroid/game/input/handler/touch/JoystickInputHandler.kt
+++ b/core/src/ru/deadsoftware/cavedroid/game/input/handler/touch/JoystickInputHandler.kt
@@ -1,6 +1,5 @@
 package ru.deadsoftware.cavedroid.game.input.handler.touch
 
-import com.badlogic.gdx.math.Vector2
 import com.badlogic.gdx.utils.TimeUtils
 import ru.deadsoftware.cavedroid.MainConfig
 import ru.deadsoftware.cavedroid.game.GameScope
@@ -32,7 +31,7 @@ class JoystickInputHandler @Inject constructor(
         set(value) {
             if (!value) {
                 resetVelocity()
-                if (TimeUtils.timeSinceMillis(activateTimeMs) < 100L &&
+                if (TimeUtils.timeSinceMillis(activateTimeMs) < 200L &&
                     mobsController.player.controlMode != Player.ControlMode.CURSOR) {
                     mobsController.player.jump()
                 }
@@ -77,10 +76,13 @@ class JoystickInputHandler @Inject constructor(
     private fun handleCursor() {
         val joystick = mainConfig.joystick ?: return
 
-        if (TimeUtils.timeSinceMillis(cursorTimeoutMs) < 200L) {
+        if (TimeUtils.timeSinceMillis(cursorTimeoutMs) < 150L) {
             return
         }
 
+        val pastCursorX = mobsController.player.cursorX
+        val pastCursorY = mobsController.player.cursorY
+
         if (Math.abs(joystick.activeX - joystick.centerX) >= Joystick.RADIUS / 2) {
             mobsController.player.cursorX += if (joystick.activeX > joystick.centerX) 1 else -1
             cursorTimeoutMs = TimeUtils.millis()
@@ -92,9 +94,17 @@ class JoystickInputHandler @Inject constructor(
         }
 
         mobsController.player.checkCursorBounds(gameWorld)
+
+        if (mobsController.player.cursorX != pastCursorX || mobsController.player.cursorY != pastCursorY) {
+            mobsController.player.blockDamage = 0f
+        }
     }
 
     private fun handleDragged() {
+        if (!active) {
+            return
+        }
+
         if (mobsController.player.controlMode == Player.ControlMode.CURSOR) {
             handleCursor()
             return
@@ -103,6 +113,10 @@ class JoystickInputHandler @Inject constructor(
         val joystick = mainConfig.joystick ?: return
         val joyVector = joystick.getVelocityVector()
 
+        if (mobsController.player.isFlyMode) {
+            joyVector.scl(2f);
+        }
+
         mobsController.player.velocity.x = joyVector.x
 
         mobsController.player.setDir(