diff options
-rw-r--r-- | src/server/game/Server/Packets/QueryPackets.cpp | 4 | ||||
-rw-r--r-- | src/server/game/Server/Packets/QueryPackets.h | 2 | ||||
-rw-r--r-- | src/server/game/Spells/SpellInfo.cpp | 1 |
3 files changed, 6 insertions, 1 deletions
diff --git a/src/server/game/Server/Packets/QueryPackets.cpp b/src/server/game/Server/Packets/QueryPackets.cpp index 10a1b336a5f..8f6e7572638 100644 --- a/src/server/game/Server/Packets/QueryPackets.cpp +++ b/src/server/game/Server/Packets/QueryPackets.cpp @@ -78,6 +78,7 @@ WorldPacket const* QueryCreatureResponse::Write() _worldPacket.WriteBits(Stats.Title.length() + 1, 11); _worldPacket.WriteBits(Stats.TitleAlt.length() + 1, 11); _worldPacket.WriteBits(Stats.CursorName.length() + 1, 6); + _worldPacket.WriteBit(Stats.Cilivilan); _worldPacket.WriteBit(Stats.Leader); for (std::size_t i = 0; i < Stats.Name.size(); ++i) @@ -86,6 +87,8 @@ WorldPacket const* QueryCreatureResponse::Write() _worldPacket.WriteBits(Stats.NameAlt[i].length() + 1, 11); } + _worldPacket.FlushBits(); + for (std::size_t i = 0; i < Stats.Name.size(); ++i) { if (!Stats.Name[i].empty()) @@ -99,6 +102,7 @@ WorldPacket const* QueryCreatureResponse::Write() _worldPacket << int32(Stats.CreatureType); _worldPacket << int32(Stats.CreatureFamily); _worldPacket << int32(Stats.Classification); + _worldPacket << uint32(Stats.PetSpellDataId); _worldPacket.append(Stats.ProxyCreatureID.data(), Stats.ProxyCreatureID.size()); _worldPacket << uint32(Stats.Display.CreatureDisplay.size()); _worldPacket << float(Stats.Display.TotalProbability); diff --git a/src/server/game/Server/Packets/QueryPackets.h b/src/server/game/Server/Packets/QueryPackets.h index d9c482e9b9e..74b777f6d93 100644 --- a/src/server/game/Server/Packets/QueryPackets.h +++ b/src/server/game/Server/Packets/QueryPackets.h @@ -67,9 +67,11 @@ namespace WorldPackets int32 CreatureType = 0; int32 CreatureFamily = 0; int32 Classification = 0; + uint32 PetSpellDataId = 0; CreatureDisplayStats Display; float HpMulti = 0.0f; float EnergyMulti = 0.0f; + bool Cilivilan = false; bool Leader = false; std::vector<int32> QuestItems; std::vector<int32> QuestCurrencies; diff --git a/src/server/game/Spells/SpellInfo.cpp b/src/server/game/Spells/SpellInfo.cpp index 4e2e92a8f21..74676b7db47 100644 --- a/src/server/game/Spells/SpellInfo.cpp +++ b/src/server/game/Spells/SpellInfo.cpp @@ -606,7 +606,6 @@ int32 SpellEffectInfo::CalcBaseValue(WorldObject const* caster, Unit const* targ if (GtStaminaMultByILvl const* staminaMult = sStaminaMultByILvlGameTable.GetRow(effectiveItemLevel)) if (ItemSparseEntry const* itemSparse = sItemSparseStore.LookupEntry(itemId)) value *= GetIlvlStatMultiplier(staminaMult, InventoryType(itemSparse->InventoryType)); - } */ |