Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2025-01-26 22:32:57 +08:00
Code Issues Projects Releases Wiki Activity

Stamina will be set to full if Stamina is disabled.

Browse Source
This commit is contained in:
gentlespoon 2022-05-10 01:42:23 -07:00 committed by Melledy
parent c424d15b32
commit 0ea0eab6b6
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -190,7 +190,9 @@ public class StaminaManager {
// Returns new stamina and sends PlayerPropNotify // Returns new stamina and sends PlayerPropNotify
public int setStamina(GameSession session, String reason, int newStamina) { public int setStamina(GameSession session, String reason, int newStamina) {
if (Grasscutter.getConfig().OpenStamina) { if (!Grasscutter.getConfig().OpenStamina) {
newStamina = player.getProperty(PlayerProperty.PROP_MAX_STAMINA);
}
// set stamina // set stamina
player.setProperty(PlayerProperty.PROP_CUR_PERSIST_STAMINA, newStamina); player.setProperty(PlayerProperty.PROP_CUR_PERSIST_STAMINA, newStamina);
session.send(new PacketPlayerPropNotify(player, PlayerProperty.PROP_CUR_PERSIST_STAMINA)); session.send(new PacketPlayerPropNotify(player, PlayerProperty.PROP_CUR_PERSIST_STAMINA));
@ -200,8 +202,6 @@ public class StaminaManager {
} }
return newStamina; return newStamina;
} }
return player.getProperty(PlayerProperty.PROP_CUR_PERSIST_STAMINA);
}
// Kills avatar, removes entity and sends notification. // Kills avatar, removes entity and sends notification.
// TODO: Probably move this to Avatar class? since other components may also need to kill avatar. // TODO: Probably move this to Avatar class? since other components may also need to kill avatar.