pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-13 14:41:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Client] Fix IsMoving for Client (#2318)

Browse Source 
* [Client] Fix IsMoving for client

* Consolidate member vars

* Update client_process.cpp
This commit is contained in:
Chris Miles 2022-07-27 08:51:51 -05:00 committed by GitHub
parent 1089f8139b
commit 7d2f88325a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
zone/client.cpp
View File

@ -349,7 +349,8 @@ Client::Client(EQStreamInterface* ieqs)
m_pp.InnateSkills[i] = InnateDisabled; m_pp.InnateSkills[i] = InnateDisabled;
temp_pvp = false; temp_pvp = false;
is_client_moving = false;
moving = false;
environment_damage_modifier = 0; environment_damage_modifier = 0;
invulnerable_environment_damage = false; invulnerable_environment_damage = false;

4
zone/client.h
View File

@ -229,8 +229,6 @@ public:
Client(EQStreamInterface * ieqs); Client(EQStreamInterface * ieqs);
~Client(); ~Client();
bool is_client_moving;
void ReconnectUCS(); void ReconnectUCS();
void SetDisplayMobInfoWindow(bool display_mob_info_window); void SetDisplayMobInfoWindow(bool display_mob_info_window);
@ -409,7 +407,7 @@ public:
inline void SetBaseRace(uint32 i) { m_pp.race=i; } inline void SetBaseRace(uint32 i) { m_pp.race=i; }
inline void SetBaseGender(uint32 i) { m_pp.gender=i; } inline void SetBaseGender(uint32 i) { m_pp.gender=i; }
inline void SetDeity(uint32 i) {m_pp.deity=i;deity=i;} inline void SetDeity(uint32 i) {m_pp.deity=i;deity=i;}
void SetTrackingID(uint32 entity_id); void SetTrackingID(uint32 entity_id);
inline uint8 GetLevel2() const { return m_pp.level2; } inline uint8 GetLevel2() const { return m_pp.level2; }

16
zone/client_packet.cpp
View File

@ -4505,9 +4505,7 @@ void Client::Handle_OP_ClientUpdate(const EQApplicationPacket *app) {
rewind_timer.Start(30000, true); rewind_timer.Start(30000, true);
} }
SetMoving(!(cy == m_Position.y && cx == m_Position.x));
is_client_moving = !(cy == m_Position.y && cx == m_Position.x);
/** /**
* Client aggro scanning * Client aggro scanning
@ -4518,11 +4516,11 @@ void Client::Handle_OP_ClientUpdate(const EQApplicationPacket *app) {
LogAggroDetail( LogAggroDetail(
"ClientUpdate [{}] {}moving, scan timer [{}]", "ClientUpdate [{}] {}moving, scan timer [{}]",
GetCleanName(), GetCleanName(),
is_client_moving ? "" : "NOT ", IsMoving() ? "" : "NOT ",
client_scan_npc_aggro_timer.GetRemainingTime() client_scan_npc_aggro_timer.GetRemainingTime()
); );
if (is_client_moving) { if (IsMoving()) {
if (client_scan_npc_aggro_timer.GetRemainingTime() > client_scan_npc_aggro_timer_moving) { if (client_scan_npc_aggro_timer.GetRemainingTime() > client_scan_npc_aggro_timer_moving) {
LogAggroDetail("Client [{}] Restarting with moving timer", GetCleanName()); LogAggroDetail("Client [{}] Restarting with moving timer", GetCleanName());
client_scan_npc_aggro_timer.Disable(); client_scan_npc_aggro_timer.Disable();
@ -4545,11 +4543,11 @@ void Client::Handle_OP_ClientUpdate(const EQApplicationPacket *app) {
LogAIScanCloseDetail( LogAIScanCloseDetail(
"Client [{}] {}moving, scan timer [{}]", "Client [{}] {}moving, scan timer [{}]",
GetCleanName(), GetCleanName(),
is_client_moving ? "" : "NOT ", IsMoving() ? "" : "NOT ",
mob_close_scan_timer.GetRemainingTime() mob_close_scan_timer.GetRemainingTime()
); );
if (is_client_moving) { if (IsMoving()) {
if (mob_close_scan_timer.GetRemainingTime() > client_mob_close_scan_timer_moving) { if (mob_close_scan_timer.GetRemainingTime() > client_mob_close_scan_timer_moving) {
LogAIScanCloseDetail("Client [{}] Restarting with moving timer", GetCleanName()); LogAIScanCloseDetail("Client [{}] Restarting with moving timer", GetCleanName());
mob_close_scan_timer.Disable(); mob_close_scan_timer.Disable();
@ -4579,7 +4577,7 @@ void Client::Handle_OP_ClientUpdate(const EQApplicationPacket *app) {
client_zone_wide_full_position_update_timer.Check() || moved_far_enough_before_bulk_update client_zone_wide_full_position_update_timer.Check() || moved_far_enough_before_bulk_update
); );
if (is_client_moving && is_ready_to_update) { if (IsMoving() && is_ready_to_update) {
LogDebug("[[{}]] Client Zone Wide Position Update NPCs", GetCleanName()); LogDebug("[[{}]] Client Zone Wide Position Update NPCs", GetCleanName());
auto &mob_movement_manager = MobMovementManager::Get(); auto &mob_movement_manager = MobMovementManager::Get();
@ -4622,7 +4620,7 @@ void Client::Handle_OP_ClientUpdate(const EQApplicationPacket *app) {
} }
/* Only feed real time updates when client is moving */ /* Only feed real time updates when client is moving */
if (is_client_moving || new_heading != m_Position.w || new_animation != animation) { if (IsMoving() || new_heading != m_Position.w || new_animation != animation) {
animation = ppu->animation; animation = ppu->animation;
m_Position.w = new_heading; m_Position.w = new_heading;

4
zone/client_process.cpp
View File

@ -124,7 +124,7 @@ bool Client::Process() {
} }
/* I haven't naturally updated my position in 10 seconds, updating manually */ /* I haven't naturally updated my position in 10 seconds, updating manually */
if (!is_client_moving && position_update_timer.Check()) { if (!IsMoving() && position_update_timer.Check()) {
SentPositionPacket(0.0f, 0.0f, 0.0f, 0.0f, 0); SentPositionPacket(0.0f, 0.0f, 0.0f, 0.0f, 0);
} }
@ -291,7 +291,7 @@ bool Client::Process() {
* Used in aggro checks * Used in aggro checks
*/ */
if (mob_close_scan_timer.Check()) { if (mob_close_scan_timer.Check()) {
entity_list.ScanCloseMobs(close_mobs, this, is_client_moving); entity_list.ScanCloseMobs(close_mobs, this, IsMoving());
} }
bool may_use_attacks = false; bool may_use_attacks = false;