Skip to content

Commit ccb12e1

Browse files
authored
fix(skymp5-server): monkey-patch the ancient stamina bug (skyrim-multiplayer#2591)
1 parent 4aa7314 commit ccb12e1

2 files changed

Lines changed: 6 additions & 5 deletions

File tree

skymp5-server/cpp/server_guest_lib/ActionListener.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -677,8 +677,9 @@ void ActionListener::OnChangeValues(const RawMessageData& rawMsgData,
677677
CropMagickaRegeneration(magicka, timeAfterRegeneration, actor);
678678
}
679679
if (staminaChanged) {
680-
currentActorValues.staminaPercentage =
681-
CropStaminaRegeneration(stamina, timeAfterRegeneration, actor);
680+
// currentActorValues.staminaPercentage =
681+
// CropStaminaRegeneration(stamina, timeAfterRegeneration, actor);
682+
currentActorValues.staminaPercentage = stamina;
682683
}
683684

684685
if (!MathUtils::IsNearlyEqual(currentActorValues.healthPercentage,

unit/ChangeValuesTest.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,8 @@ TEST_CASE("OnChangeValues call is cropping percentage values",
9090

9191
REQUIRE_THAT(changeForm.actorValues.healthPercentage,
9292
Catch::Matchers::WithinAbs(expectedHealth + 0.1f, 0.001f));
93-
REQUIRE_THAT(changeForm.actorValues.staminaPercentage,
94-
Catch::Matchers::WithinAbs(expectedStamina, 0.001f));
93+
// REQUIRE_THAT(changeForm.actorValues.staminaPercentage,
94+
// Catch::Matchers::WithinAbs(expectedStamina, 0.001f));
9595
REQUIRE_THAT(changeForm.actorValues.magickaPercentage,
9696
Catch::Matchers::WithinAbs(expectedMagicka, 0.001f));
9797

@@ -159,7 +159,7 @@ TEST_CASE("OnChangeValues function sends ChangeValues message with new "
159159
REQUIRE(message["data"]["magicka"] != 0.0f);
160160
REQUIRE(message["data"]["magicka"] != 1.0f);
161161
REQUIRE(message["data"]["stamina"] != 0.0f);
162-
REQUIRE(message["data"]["stamina"] != 1.0f);
162+
// REQUIRE(message["data"]["stamina"] != 1.0f);
163163

164164
partOne.DestroyActor(0xff000000);
165165
DoDisconnect(partOne, 0);

0 commit comments

Comments
 (0)