Grasscutters/Grasscutter
3
0
Fork 0
mirror of https://github.com/Melledy/Grasscutter.git synced 2024-11-25 10:51:47 +00:00
Code Issues Projects Releases Wiki Activity

Fix swim stamina cost (#2287)

Browse Source
This commit is contained in:
Thoronium 2023-08-06 22:25:59 -06:00 committed by GitHub
parent 8291e366b9
commit 58d2650505
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/emu/grasscutter/game/managers/stamina/StaminaManager.java
View File

@ -389,6 +389,9 @@ public class StaminaManager extends BasePlayerManager {
return; return;
} }
// Update previous motion state
this.previousState = currentState;
// Update the current state. // Update the current state.
this.currentState = motionState; this.currentState = motionState;
// logger.trace(currentState + "\t" + (notifyEntityId == currentAvatarEntityId ? "character" : "vehicle")); // logger.trace(currentState + "\t" + (notifyEntityId == currentAvatarEntityId ? "character" : "vehicle"));
@ -417,6 +420,11 @@ public class StaminaManager extends BasePlayerManager {
// Internal handler // Internal handler
private void handleImmediateStamina(GameSession session, @NotNull MotionState motionState) { private void handleImmediateStamina(GameSession session, @NotNull MotionState motionState) {
// Don't double dip on sustained stamina start costs
if (previousState == currentState) {
return;
}
switch (motionState) { switch (motionState) {
case MOTION_STATE_CLIMB -> case MOTION_STATE_CLIMB ->
updateStaminaRelative(session, new Consumption(ConsumptionType.CLIMB_START), true); updateStaminaRelative(session, new Consumption(ConsumptionType.CLIMB_START), true);