From 133c1e866c4abc339e4d23d75d2bae172fbc8eb0 Mon Sep 17 00:00:00 2001
From: Kinglykrab <89047260+Kinglykrab@users.noreply.github.com>
Date: Mon, 4 Oct 2021 17:25:51 -0400
Subject: [PATCH] [Bug Fix] Send appearance wasn't setting size properly when
 changing races. (#1586)

---
 zone/mob.cpp | 38 +++++---------------------------------
 1 file changed, 5 insertions(+), 33 deletions(-)

diff --git a/zone/mob.cpp b/zone/mob.cpp
index 240496ef4..b81eb6146 100644
--- a/zone/mob.cpp
+++ b/zone/mob.cpp
@@ -1766,21 +1766,21 @@ void Mob::SendIllusionPacket(
 
 	race = in_race;
 	if (race == 0) {
-		race = (use_model) ? use_model : GetBaseRace();
+		race = use_model ? use_model : GetBaseRace();
 	}
 
 	if (in_gender != 0xFF) {
 		gender = in_gender;
 	}
 	else {
-		gender = (in_race) ? GetDefaultGender(race, gender) : GetBaseGender();
+		gender = in_race ? GetDefaultGender(race, gender) : GetBaseGender();
 	}
 
-	if (in_texture == 0xFF && !IsPlayerRace(in_race)) {
+	if (in_texture == 0xFF && !IsPlayerRace(race)) {
 		new_texture = GetTexture();
 	}
 
-	if (in_helmtexture == 0xFF && !IsPlayerRace(in_race)) {
+	if (in_helmtexture == 0xFF && !IsPlayerRace(race)) {
 		new_helmtexture = GetHelmTexture();
 	}
 
@@ -1813,38 +1813,10 @@ void Mob::SendIllusionPacket(
 		new_drakkin_heritage = drakkin_heritage = CastToClient()->GetBaseHeritage();
 		new_drakkin_tattoo   = drakkin_tattoo   = CastToClient()->GetBaseTattoo();
 		new_drakkin_details  = drakkin_details  = CastToClient()->GetBaseDetails();
-		switch (race) {
-			case OGRE:
-				size = 9;
-				break;
-			case TROLL:
-				size = 8;
-				break;
-			case VAHSHIR:
-			case BARBARIAN:
-				size = 7;
-				break;
-			case HALF_ELF:
-			case WOOD_ELF:
-			case DARK_ELF:
-			case FROGLOK:
-				size = 5;
-				break;
-			case DWARF:
-				size = 4;
-				break;
-			case HALFLING:
-			case GNOME:
-				size = 3;
-				break;
-			default:
-				size = 6;
-				break;
-		}
 	}
 
 	// update internal values for mob
-	size             = (in_size <= 0.0f) ? GetSize() : in_size;
+	size             = (in_size <= 0.0f) ? GetRaceGenderDefaultHeight(race, gender) : in_size;
 	texture          = new_texture;
 	helmtexture      = new_helmtexture;
 	haircolor        = new_haircolor;