pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-03-04 00:02:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #407 from noudess/master

Browse Source 
The mob AT_Anim (as set in spawn2) was not working in some cases.
This commit is contained in:
Alex 2015-05-06 17:30:56 -07:00
commit be0507c4d3
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
zone/entity.cpp
View File

@ -619,6 +619,7 @@ void EntityList::AddNPC(NPC *npc, bool SendSpawnPacket, bool dontqueue)
npc->CreateSpawnPacket(app, npc); npc->CreateSpawnPacket(app, npc);
QueueClients(npc, app); QueueClients(npc, app);
npc->SendArmorAppearance(); npc->SendArmorAppearance();
npc->SetAppearance(npc->GetGuardPointAnim(),false);
safe_delete(app); safe_delete(app);
} else { } else {
NewSpawn_Struct *ns = new NewSpawn_Struct; NewSpawn_Struct *ns = new NewSpawn_Struct;
@ -737,6 +738,7 @@ void EntityList::CheckSpawnQueue()
auto it = npc_list.find(ns->spawn.spawnId); auto it = npc_list.find(ns->spawn.spawnId);
NPC *pnpc = it->second; NPC *pnpc = it->second;
pnpc->SendArmorAppearance(); pnpc->SendArmorAppearance();
pnpc->SetAppearance(pnpc->GetGuardPointAnim(),false);
safe_delete(outapp); safe_delete(outapp);
iterator.RemoveCurrent(); iterator.RemoveCurrent();
} }

10
zone/mob.cpp
View File

@ -2040,12 +2040,10 @@ const int32& Mob::SetMana(int32 amount)
void Mob::SetAppearance(EmuAppearance app, bool iIgnoreSelf) { void Mob::SetAppearance(EmuAppearance app, bool iIgnoreSelf) {
if (_appearance != app) { _appearance = app;
_appearance = app; SendAppearancePacket(AT_Anim, GetAppearanceValue(app), true, iIgnoreSelf);
SendAppearancePacket(AT_Anim, GetAppearanceValue(app), true, iIgnoreSelf); if (this->IsClient() && this->IsAIControlled())
if (this->IsClient() && this->IsAIControlled()) SendAppearancePacket(AT_Anim, ANIM_FREEZE, false, false);
SendAppearancePacket(AT_Anim, ANIM_FREEZE, false, false);
}
} }
bool Mob::UpdateActiveLight() bool Mob::UpdateActiveLight()