#588 Fixed ball spawn delay.

Shynixn · Dec 19, 2024 · b40049e · b40049e
1 parent 297ae95
commit b40049e
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 17 deletions.
diff --git a/src/main/java/com/github/shynixn/blockball/entity/SoccerBallSettings.kt b/src/main/java/com/github/shynixn/blockball/entity/SoccerBallSettings.kt
@@ -86,7 +86,7 @@ class SoccerBallSettings {
     val soundEffects: MutableMap<BallActionType, SoundMeta> = HashMap()
 
     /** Spawning delay. */
-    var delayInTicks: Int = 0
+    var delayInTicks: Int = 60
 
     /** Spawnpoint of the ball. */
     var spawnpoint: Vector3d? = null

diff --git a/src/main/java/com/github/shynixn/blockball/impl/SoccerGameImpl.kt b/src/main/java/com/github/shynixn/blockball/impl/SoccerGameImpl.kt
@@ -796,14 +796,13 @@ abstract class SoccerGameImpl(
      * Teleports all players and ball back to their spawnpoint if [game] has got back teleport enabled.
      */
     private fun relocatePlayersAndBall() {
+        respawnBall()
+
         if (!arena.meta.customizingMeta.backTeleport) {
-            respawnBall()
             return
         }
 
         val tickDelay = 20 * arena.meta.customizingMeta.backTeleportDelay
-
-        respawnBall(tickDelay)
         plugin.launch {
             delay(tickDelay.ticks)
             var redTeamSpawnpoint = arena.meta.redTeamMeta.spawnpoint
@@ -934,8 +933,13 @@ abstract class SoccerGameImpl(
             return
         }
 
+        if (ball != null) {
+            ball!!.remove()
+            ball = null
+        }
+
         ballSpawning = true
-        ballSpawnCounter = delayInTicks / 20
+        ballSpawnCounter = delayInTicks
     }
 
     fun getTeamMetaFromTeam(team: Team): TeamMeta {

diff --git a/src/main/java/com/github/shynixn/blockball/impl/SoccerHubGameImpl.kt b/src/main/java/com/github/shynixn/blockball/impl/SoccerHubGameImpl.kt
@@ -65,10 +65,7 @@ class SoccerHubGameImpl(
 
         // Handle SoccerBall.
         this.fixBallPositionSpawn()
-        if (ticks >= 20) {
-            this.handleBallSpawning()
-        }
-
+        this.handleBallSpawning()
         // TODO: Minigame essentials. Update signs and protections.
         super.handleMiniGameEssentials(ticks)
     }

diff --git a/src/main/java/com/github/shynixn/blockball/impl/SoccerMiniGameImpl.kt b/src/main/java/com/github/shynixn/blockball/impl/SoccerMiniGameImpl.kt
@@ -204,10 +204,7 @@ open class SoccerMiniGameImpl constructor(
 
         // Handle SoccerBall.
         this.fixBallPositionSpawn()
-        if (ticks >= 20) {
-            this.handleBallSpawning()
-        }
-
+        this.handleBallSpawning()
         // Update signs and protections.
         super.handleMiniGameEssentials(ticks)
     }

diff --git a/src/main/java/com/github/shynixn/blockball/impl/SoccerRefereeGameImpl.kt b/src/main/java/com/github/shynixn/blockball/impl/SoccerRefereeGameImpl.kt
@@ -206,10 +206,7 @@ class SoccerRefereeGameImpl constructor(
 
         // Handle SoccerBall.
         this.fixBallPositionSpawn()
-        if (ticks >= 20) {
-            this.handleBallSpawning()
-        }
-
+        this.handleBallSpawning()
         // Update signs and protections.
         super.handleMiniGameEssentials(ticks)
     }