diff options
Diffstat (limited to 'src/actions')
| -rw-r--r-- | src/actions/actions.cpp | 2 | ||||
| -rw-r--r-- | src/actions/move.cpp | 16 |
2 files changed, 9 insertions, 9 deletions
diff --git a/src/actions/actions.cpp b/src/actions/actions.cpp index 6c8c49ca6..b857f0f10 100644 --- a/src/actions/actions.cpp +++ b/src/actions/actions.cpp @@ -347,7 +347,7 @@ impHandler0(itenplz) { if (actorManager) { - if (Net::getPlayerHandler() && Net::getPlayerHandler()->canUseMagic() + if (playerHandler && playerHandler->canUseMagic() && PlayerInfo::getAttribute(Attributes::MP) >= 3) { actorManager->itenplz(); diff --git a/src/actions/move.cpp b/src/actions/move.cpp index 28b51cfe2..cc4c27b6c 100644 --- a/src/actions/move.cpp +++ b/src/actions/move.cpp @@ -160,8 +160,8 @@ impHandler0(directUp) // if (PacketLimiter::limitPackets(PACKET_DIRECTION)) { localPlayer->setDirection(BeingDirection::UP); - if (Net::getPlayerHandler()) - Net::getPlayerHandler()->setDirection(BeingDirection::UP); + if (playerHandler) + playerHandler->setDirection(BeingDirection::UP); } } return true; @@ -178,9 +178,9 @@ impHandler0(directDown) // if (PacketLimiter::limitPackets(PACKET_DIRECTION)) { localPlayer->setDirection(BeingDirection::DOWN); - if (Net::getPlayerHandler()) + if (playerHandler) { - Net::getPlayerHandler()->setDirection( + playerHandler->setDirection( BeingDirection::DOWN); } } @@ -199,9 +199,9 @@ impHandler0(directLeft) // if (PacketLimiter::limitPackets(PACKET_DIRECTION)) { localPlayer->setDirection(BeingDirection::LEFT); - if (Net::getPlayerHandler()) + if (playerHandler) { - Net::getPlayerHandler()->setDirection( + playerHandler->setDirection( BeingDirection::LEFT); } } @@ -220,9 +220,9 @@ impHandler0(directRight) // if (PacketLimiter::limitPackets(PACKET_DIRECTION)) { localPlayer->setDirection(BeingDirection::RIGHT); - if (Net::getPlayerHandler()) + if (playerHandler) { - Net::getPlayerHandler()->setDirection( + playerHandler->setDirection( BeingDirection::RIGHT); } } |