Merge pull request #10044 from WinterSolstice8/npc_look_size_stuff

Xaver-DaRed · web-flow · commit 6a6232aaed92 · 2026-05-16T04:02:48.000+02:00
[core] Don't clobber look string data for entities that dont have it
diff --git a/src/map/packets/entity_update.cpp b/src/map/packets/entity_update.cpp
@@ -587,7 +587,8 @@ void CEntityUpdatePacket::updateWith(CBaseEntity* PEntity, ENTITYUPDATE type, ui
         std::memcpy(start, name.c_str(), maxLength);
     }
 
-    if (packet->SendFlg.General)
+    //  Don't overwrite data for model size and hitbox size from look string on NPCs
+    if (packet->SendFlg.General && (PEntity->objtype == TYPE_PC || PEntity->objtype == TYPE_PET || PEntity->objtype == TYPE_MOB))
     {
         packet->Flags1.GraphSize = PEntity->modelSize;
         // For some reason, SE reused a player struct where this "g" value is the hitbox size.

Original file line number	Diff line number	Diff line change
`@@ -587,7 +587,8 @@ void CEntityUpdatePacket::updateWith(CBaseEntity* PEntity, ENTITYUPDATE type, ui`
`587`	`587`	`std::memcpy(start, name.c_str(), maxLength);`
`588`	`588`	`}`
`589`	`589`
`590`		`- if (packet->SendFlg.General)`
	`590`	`+ // Don't overwrite data for model size and hitbox size from look string on NPCs`
	`591`	`+ if (packet->SendFlg.General && (PEntity->objtype == TYPE_PC \|\| PEntity->objtype == TYPE_PET \|\| PEntity->objtype == TYPE_MOB))`
`591`	`592`	`{`
`592`	`593`	`packet->Flags1.GraphSize = PEntity->modelSize;`
`593`	`594`	`// For some reason, SE reused a player struct where this "g" value is the hitbox size.`