Skip to content

Commit

Permalink
avoid conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
nic11 committed Jan 14, 2025
1 parent 2dd9120 commit f634b04
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions skymp5-server/cpp/server_guest_lib/ActionListener.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -890,13 +890,12 @@ bool ShouldBeBlocked(const MpActor& aggressor, const MpActor& target)
void ActionListener::OnHit(const RawMessageData& rawMsgData_,
const HitData& hitData_)
{
ANTIGO_CONTEXT_INIT(ctx);

auto currentHitTime = std::chrono::steady_clock::now();
MpActor* myActor = partOne.serverState.ActorByUser(rawMsgData_.userId);
if (!myActor) {
throw std::runtime_error("Unable to change values without Actor attached");
}
ANTIGO_CONTEXT_INIT(ctx);

MpActor* aggressor = nullptr;

Expand Down Expand Up @@ -948,7 +947,6 @@ void ActionListener::OnHit(const RawMessageData& rawMsgData_,
spdlog::error("ActionListener::OnHit - MpObjectReference not found for "
"hitData.target {:x}",
hitData.target);
ctx.Resolve().Print();
return;
}

Expand Down

0 comments on commit f634b04

Please sign in to comment.