develop-turtleGame #6

Merged
Pupsi merged 32 commits from develop-turtleGame into develop 2025-10-15 20:21:27 +00:00
Showing only changes of commit 35dc924104 - Show all commits

View File

@@ -46,8 +46,8 @@ public class Turtle extends EntityCreature {
this.removePassenger(this.player); this.removePassenger(this.player);
this.remove(); this.remove();
this.kill(); this.kill();
if(this.boostRefillTask.isAlive()) this.boostRefillTask.cancel(); if(this.boostRefillTask != null && this.boostRefillTask.isAlive()) this.boostRefillTask.cancel();
if(this.boostTask.isAlive()) this.boostTask.cancel(); if(this.boostTask != null && this.boostTask.isAlive()) this.boostTask.cancel();
} }
public void adaptView() { public void adaptView() {
@@ -82,7 +82,7 @@ public class Turtle extends EntityCreature {
} }
public void cancelBoost() { public void cancelBoost() {
if(!this.boostTask.isAlive()) return; if(this.boostTask == null || !this.boostTask.isAlive()) return;
this.boostTask.cancel(); this.boostTask.cancel();
this.boostSpeedMultiplier = 1; this.boostSpeedMultiplier = 1;
} }