Skip to content
Snippets Groups Projects
Commit 5d917f18 authored by gentlespoon's avatar gentlespoon Committed by Melledy
Browse files

Move "if Grasscutter.getConfig().OpenStamina" to the correct place.

parent eb2b2392
Branches
Tags
No related merge requests found
......@@ -190,6 +190,7 @@ public class StaminaManager {
// Returns new stamina and sends PlayerPropNotify
public int setStamina(GameSession session, String reason, int newStamina) {
if (Grasscutter.getConfig().OpenStamina) {
// set stamina
player.setProperty(PlayerProperty.PROP_CUR_PERSIST_STAMINA, newStamina);
session.send(new PacketPlayerPropNotify(player, PlayerProperty.PROP_CUR_PERSIST_STAMINA));
......@@ -199,6 +200,8 @@ public class StaminaManager {
}
return newStamina;
}
return player.getProperty(PlayerProperty.PROP_CUR_PERSIST_STAMINA);
}
// Kills avatar, removes entity and sends notification.
// TODO: Probably move this to Avatar class? since other components may also need to kill avatar.
......@@ -288,7 +291,6 @@ public class StaminaManager {
private class SustainedStaminaHandler extends TimerTask {
public void run() {
if (Grasscutter.getConfig().OpenStamina) {
boolean moving = isPlayerMoving();
int currentStamina = player.getProperty(PlayerProperty.PROP_CUR_PERSIST_STAMINA);
int maxStamina = player.getProperty(PlayerProperty.PROP_MAX_STAMINA);
......@@ -333,7 +335,6 @@ public class StaminaManager {
updateStaminaRelative(cachedSession, consumption);
}
}
}
previousState = currentState;
previousCoordinates = new Position(
currentCoordinates.getX(),
......
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