Commit 0ea0eab6 authored by gentlespoon's avatar gentlespoon Committed by Melledy
Browse files

Stamina will be set to full if Stamina is disabled.

parent c424d15b
...@@ -190,7 +190,9 @@ public class StaminaManager { ...@@ -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 { ...@@ -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.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment