From 1c353095386d0b744ff2588942724dd2ff725338 Mon Sep 17 00:00:00 2001 From: Emagi Date: Sun, 9 Feb 2025 19:06:49 -0500 Subject: [PATCH] fix behavior on zoning for clients to not impact other players --- source/WorldServer/Entity.cpp | 2 +- source/WorldServer/client.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/source/WorldServer/Entity.cpp b/source/WorldServer/Entity.cpp index 5fb1418..c4832d7 100644 --- a/source/WorldServer/Entity.cpp +++ b/source/WorldServer/Entity.cpp @@ -147,7 +147,7 @@ void Entity::DeleteSpellEffects(bool removeClient) map::iterator deletedPtrItrs; for(deletedPtrItrs = deletedPtrs.begin(); deletedPtrItrs != deletedPtrs.end(); deletedPtrItrs++) { - if(itr->second) + if(deletedPtrItrs->second) lua_interface->RemoveSpell(deletedPtrItrs->first, false, removeClient, "", removeClient, false, this); else lua_interface->RemoveSpell(deletedPtrItrs->first, false, removeClient, "", removeClient, true, this); diff --git a/source/WorldServer/client.cpp b/source/WorldServer/client.cpp index ae97db0..cb36df5 100644 --- a/source/WorldServer/client.cpp +++ b/source/WorldServer/client.cpp @@ -4999,7 +4999,7 @@ void Client::Zone(ZoneChangeDetails* new_zone, ZoneServer* opt_zone, bool set_co LogWrite(CCLIENT__DEBUG, 0, "Client", "%s: Removing player from current zone...", __FUNCTION__); GetCurrentZone()->RemoveSpawn(player, false, true, true, true, !is_spell); - GetPlayer()->DeleteSpellEffects(true); + GetPlayer()->DeleteSpellEffects(); LogWrite(CCLIENT__DEBUG, 0, "Client", "%s: Setting zone to '%s'...", __FUNCTION__, new_zone->zoneName.c_str()); SetZoningDestination(opt_zone);