Fix boost ticking

GeyserMC · May 20, 2024 · de5b1a2 · de5b1a2
1 parent 16d766d
commit de5b1a2
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 27 deletions.
diff --git a/core/src/main/java/org/geysermc/geyser/entity/type/living/animal/PigEntity.java b/core/src/main/java/org/geysermc/geyser/entity/type/living/animal/PigEntity.java
@@ -102,11 +102,8 @@ public VehicleComponent<?> getVehicleComponent() {
     }
 
     @Override
-    public boolean isClientControlled() {
-        return getFlag(EntityFlag.SADDLED)
-                && !passengers.isEmpty()
-                && passengers.get(0) == session.getPlayerEntity()
-                && session.getPlayerInventory().isHolding(Items.CARROT_ON_A_STICK);
+    public Vector2f getAdjustedInput(Vector2f input) {
+        return Vector2f.UNIT_Y;
     }
 
     @Override
@@ -115,7 +112,10 @@ public float getVehicleSpeed() {
     }
 
     @Override
-    public Vector2f getAdjustedInput(Vector2f input) {
-        return Vector2f.UNIT_Y;
+    public boolean isClientControlled() {
+        return getFlag(EntityFlag.SADDLED)
+                && !passengers.isEmpty()
+                && passengers.get(0) == session.getPlayerEntity()
+                && session.getPlayerInventory().isHolding(Items.CARROT_ON_A_STICK);
     }
 }
diff --git a/core/src/main/java/org/geysermc/geyser/entity/type/living/animal/StriderEntity.java b/core/src/main/java/org/geysermc/geyser/entity/type/living/animal/StriderEntity.java
@@ -144,26 +144,26 @@ public void setBoost(IntEntityMetadata entityMetadata) {
     }
 
     @Override
-    public @NonNull VehicleComponent<?> getVehicleComponent() {
+    public VehicleComponent<?> getVehicleComponent() {
         return vehicleComponent;
     }
 
     @Override
-    public @NonNull Vector2f getAdjustedInput(Vector2f input) {
+    public Vector2f getAdjustedInput(Vector2f input) {
         return Vector2f.UNIT_Y;
     }
 
     @Override
-    public boolean isClientControlled() {
-        // Does not require saddle
-        return !passengers.isEmpty()
-                && passengers.get(0) == session.getPlayerEntity()
-                && session.getPlayerInventory().isHolding(Items.WARPED_FUNGUS_ON_A_STICK);
+    public float getVehicleSpeed() {
+        return vehicleComponent.getMoveSpeed() * (isCold ? 0.35f : 0.55f) * vehicleComponent.getBoostMultiplier();
     }
 
     @Override
-    public float getVehicleSpeed() {
-        return vehicleComponent.getMoveSpeed() * (isCold ? 0.35f : 0.55f) * vehicleComponent.getBoostMultiplier();
+    public boolean isClientControlled() {
+        return getFlag(EntityFlag.SADDLED)
+                && !passengers.isEmpty()
+                && passengers.get(0) == session.getPlayerEntity()
+                && session.getPlayerInventory().isHolding(Items.WARPED_FUNGUS_ON_A_STICK);
     }
 
     @Override

diff --git a/core/src/main/java/org/geysermc/geyser/entity/vehicle/BoostableVehicleComponent.java b/core/src/main/java/org/geysermc/geyser/entity/vehicle/BoostableVehicleComponent.java
@@ -38,12 +38,12 @@ public BoostableVehicleComponent(T vehicle, float stepHeight) {
 
     public void startBoost(int boostLength) {
         this.boostLength = boostLength;
-        this.boostTicks = 0;
+        this.boostTicks = 1;
     }
 
     public float getBoostMultiplier() {
         if (isBoosting()) {
-            return 1.0f + 1.15f * TrigMath.sin((float)boostTicks / (float)boostLength * TrigMath.PI);
+            return 1.0f + 1.15f * TrigMath.sin((float) boostTicks / (float) boostLength * TrigMath.PI);
         }
         return 1.0f;
     }
@@ -53,10 +53,12 @@ public boolean isBoosting() {
     }
 
     @Override
-    public void tickVehicle() {
-        super.tickVehicle();
-        if (isBoosting()) {
+    public boolean tickVehicle() {
+        boolean clientControlled = super.tickVehicle();
+        if (clientControlled && isBoosting()) {
             boostTicks++;
         }
+
+        return clientControlled;
     }
 }
diff --git a/core/src/main/java/org/geysermc/geyser/entity/vehicle/CamelVehicleComponent.java b/core/src/main/java/org/geysermc/geyser/entity/vehicle/CamelVehicleComponent.java
@@ -55,7 +55,7 @@ public void startDashCooldown() {
     }
 
     @Override
-    public void tickVehicle() {
+    public boolean tickVehicle() {
         if (this.dashTick != 0) {
             if (vehicle.getSession().getTicks() > this.dashTick) {
                 vehicle.setFlag(EntityFlag.HAS_DASH_COOLDOWN, false);
@@ -68,7 +68,7 @@ public void tickVehicle() {
         vehicle.setFlag(EntityFlag.CAN_DASH, vehicle.getFlag(EntityFlag.SADDLED) && !isStationary());
         vehicle.updateBedrockMetadata();
 
-        super.tickVehicle();
+        return super.tickVehicle();
     }
 
     @Override

diff --git a/core/src/main/java/org/geysermc/geyser/entity/vehicle/ClientVehicle.java b/core/src/main/java/org/geysermc/geyser/entity/vehicle/ClientVehicle.java
@@ -32,10 +32,10 @@ public interface ClientVehicle {
 
     Vector2f getAdjustedInput(Vector2f input);
 
-    boolean isClientControlled();
-
     float getVehicleSpeed();
 
+    boolean isClientControlled();
+
     default boolean canWalkOnLava() {
         return false;
     }

diff --git a/core/src/main/java/org/geysermc/geyser/entity/vehicle/VehicleComponent.java b/core/src/main/java/org/geysermc/geyser/entity/vehicle/VehicleComponent.java
@@ -147,9 +147,9 @@ public void onDismount() {
         //
     }
 
-    public void tickVehicle() {
+    public boolean tickVehicle() {
         if (!vehicle.isClientControlled()) {
-            return;
+            return false;
         }
 
         ObjectDoublePair<Fluid> fluidHeight = updateFluidMovement();
@@ -164,6 +164,8 @@ public void tickVehicle() {
             }
             case EMPTY -> landMovement();
         }
+
+        return true;
     }
 
     protected ObjectDoublePair<Fluid> updateFluidMovement() {