From 81ea6f54d93ee10b03e6432c6071e0d0983796a2 Mon Sep 17 00:00:00 2001 From: Meji Date: Thu, 30 Mar 2023 18:54:27 +0200 Subject: Core/Creatures: Compute CombatReach and BoundingRadius using DisplayScale (#28863) --- src/server/scripts/Commands/cs_modify.cpp | 11 ++++------- src/server/scripts/Commands/cs_npc.cpp | 3 +-- 2 files changed, 5 insertions(+), 9 deletions(-) (limited to 'src/server/scripts/Commands') diff --git a/src/server/scripts/Commands/cs_modify.cpp b/src/server/scripts/Commands/cs_modify.cpp index ded5f48b7e5..49f04af4593 100644 --- a/src/server/scripts/Commands/cs_modify.cpp +++ b/src/server/scripts/Commands/cs_modify.cpp @@ -495,15 +495,12 @@ public: //Edit Player or Creature Scale static bool HandleModifyScaleCommand(ChatHandler* handler, char const* args) { - float Scale; + float scale; Unit* target = handler->getSelectedUnit(); - if (CheckModifySpeed(handler, args, target, Scale, 0.1f, 10.0f, false)) + if (CheckModifySpeed(handler, args, target, scale, 0.1f, 10.0f, false)) { - NotifyModification(handler, target, LANG_YOU_CHANGE_SIZE, LANG_YOURS_SIZE_CHANGED, Scale); - if (Creature* creatureTarget = target->ToCreature()) - creatureTarget->SetDisplayId(creatureTarget->GetDisplayId(), Scale); - else - target->SetObjectScale(Scale); + NotifyModification(handler, target, LANG_YOU_CHANGE_SIZE, LANG_YOURS_SIZE_CHANGED, scale); + target->SetObjectScale(scale); return true; } return false; diff --git a/src/server/scripts/Commands/cs_npc.cpp b/src/server/scripts/Commands/cs_npc.cpp index 94023ff1db4..75e622d8d88 100644 --- a/src/server/scripts/Commands/cs_npc.cpp +++ b/src/server/scripts/Commands/cs_npc.cpp @@ -693,8 +693,7 @@ public: return false; } - creature->SetDisplayId(displayId); - creature->SetNativeDisplayId(displayId); + creature->SetDisplayId(displayId, true); creature->SaveToDB(); -- cgit v1.2.3