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

Merge branch 'master' into auras

Browse Source
This commit is contained in:
Michael Cook (mackal) 2017-07-16 00:09:26 -04:00
commit ab5fe1e518
3 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
zone/client.cpp
View File

@ -160,7 +160,7 @@ Client::Client(EQStreamInterface* ieqs)
npc_close_scan_timer(6000), npc_close_scan_timer(6000),
hp_self_update_throttle_timer(300), hp_self_update_throttle_timer(300),
hp_other_update_throttle_timer(500), hp_other_update_throttle_timer(500),
position_update_timer(0) position_update_timer(10000)
{ {
for (int client_filter = 0; client_filter < _FilterCount; client_filter++) for (int client_filter = 0; client_filter < _FilterCount; client_filter++)

26
zone/client_packet.cpp
View File

@ -4615,22 +4615,24 @@ void Client::Handle_OP_ClientUpdate(const EQApplicationPacket *app)
this->SendAppearanceEffect(41, 0, 0, 0, 0); this->SendAppearanceEffect(41, 0, 0, 0, 0);
} }
/* Broadcast update to other clients */ /* Only feed real time updates when client is moving */
auto outapp = new EQApplicationPacket(OP_ClientUpdate, sizeof(PlayerPositionUpdateServer_Struct)); if (is_client_moving) {
PlayerPositionUpdateServer_Struct* position_update = (PlayerPositionUpdateServer_Struct*)outapp->pBuffer;
MakeSpawnUpdate(position_update); /* Broadcast update to other clients */
auto outapp = new EQApplicationPacket(OP_ClientUpdate, sizeof(PlayerPositionUpdateServer_Struct));
PlayerPositionUpdateServer_Struct* position_update = (PlayerPositionUpdateServer_Struct*)outapp->pBuffer;
position_update_timer.Start(10000, true); MakeSpawnUpdate(position_update);
if (gm_hide_me) { if (gm_hide_me) {
entity_list.QueueClientsStatus(this, outapp, true, Admin(), 250); entity_list.QueueClientsStatus(this, outapp, true, Admin(), 250);
}
else {
entity_list.QueueCloseClients(this, outapp, true, 300, nullptr, true);
}
safe_delete(outapp);
} }
else {
entity_list.QueueCloseClients(this, outapp, true, 300, nullptr, true);
}
safe_delete(outapp);
if (zone->watermap) { if (zone->watermap) {
if (zone->watermap->InLiquid(glm::vec3(m_Position))) if (zone->watermap->InLiquid(glm::vec3(m_Position)))

2
zone/client_process.cpp
View File

@ -120,7 +120,7 @@ bool Client::Process() {
SendHPUpdate(); SendHPUpdate();
/* 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 (position_update_timer.Check()) { if (!is_client_moving && position_update_timer.Check()) {
SendPositionUpdate(); SendPositionUpdate();
} }