diff options
| -rw-r--r-- | src/server/game/Garrison/Garrison.cpp | 2 | ||||
| -rw-r--r-- | src/server/game/Server/Packets/CharacterPackets.h | 2 | ||||
| -rw-r--r-- | src/server/game/Server/Packets/MovementPackets.h | 2 | ||||
| -rw-r--r-- | src/server/game/Spells/Spell.cpp | 3 | ||||
| -rw-r--r-- | src/server/game/Spells/SpellInfo.cpp | 1 | ||||
| -rw-r--r-- | src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/shattered_halls.cpp | 2 |
6 files changed, 8 insertions, 4 deletions
diff --git a/src/server/game/Garrison/Garrison.cpp b/src/server/game/Garrison/Garrison.cpp index c6475183c39..749ebb562c5 100644 --- a/src/server/game/Garrison/Garrison.cpp +++ b/src/server/game/Garrison/Garrison.cpp @@ -581,7 +581,7 @@ GarrisonError Garrison::CheckBuildingPlacement(uint32 garrPlotInstanceId, uint32 if (!_owner->HasCurrency(building->CostCurrencyID, building->CostCurrencyAmount)) return GARRISON_ERROR_NOT_ENOUGH_CURRENCY; - if (!_owner->HasEnoughMoney(uint64(building->CostMoney * GOLD))) + if (!_owner->HasEnoughMoney(uint64(building->CostMoney) * GOLD)) return GARRISON_ERROR_NOT_ENOUGH_GOLD; // New building cannot replace another building currently under construction diff --git a/src/server/game/Server/Packets/CharacterPackets.h b/src/server/game/Server/Packets/CharacterPackets.h index cee4f5edb5c..b3f280f9411 100644 --- a/src/server/game/Server/Packets/CharacterPackets.h +++ b/src/server/game/Server/Packets/CharacterPackets.h @@ -608,7 +608,7 @@ namespace WorldPackets WorldPacket const* Write() override; - BarberShopResult Result; + BarberShopResult Result = BARBER_SHOP_RESULT_SUCCESS; }; class LogXPGain final : public ServerPacket diff --git a/src/server/game/Server/Packets/MovementPackets.h b/src/server/game/Server/Packets/MovementPackets.h index 6803bdf3b95..d4fb41cf330 100644 --- a/src/server/game/Server/Packets/MovementPackets.h +++ b/src/server/game/Server/Packets/MovementPackets.h @@ -398,7 +398,7 @@ namespace WorldPackets void Read() override; ObjectGuid MoverGUID; - uint32 TimeSkipped; + uint32 TimeSkipped = 0; }; } diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp index 9f7edb85195..6f2f761868e 100644 --- a/src/server/game/Spells/Spell.cpp +++ b/src/server/game/Spells/Spell.cpp @@ -2328,6 +2328,9 @@ void Spell::DoAllEffectOnTarget(TargetInfo* target) return; } + if (!unit) + return; + if (unit->IsAlive() != target->alive) return; diff --git a/src/server/game/Spells/SpellInfo.cpp b/src/server/game/Spells/SpellInfo.cpp index 0bdb36b988f..7b012d8a0f6 100644 --- a/src/server/game/Spells/SpellInfo.cpp +++ b/src/server/game/Spells/SpellInfo.cpp @@ -1822,6 +1822,7 @@ SpellCastResult SpellInfo::CheckLocation(uint32 map_id, uint32 zone_id, uint32 a if (!player->CanFlyInZone(map_id, zone_id)) return SPELL_FAILED_INCORRECT_AREA; } + break; } case SPELL_AURA_MOUNTED: { diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/shattered_halls.cpp b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/shattered_halls.cpp index 500b0ae4bcb..d31fa4c4f09 100644 --- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/shattered_halls.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/shattered_halls.cpp @@ -29,7 +29,7 @@ class at_nethekurse_exit : public AreaTriggerScript public: at_nethekurse_exit() : AreaTriggerScript("at_nethekurse_exit") { }; - bool OnTrigger(Player* player, AreaTriggerEntry const*) override + bool OnTrigger(Player* player, AreaTriggerEntry const*, bool /*entered*/) override { if (InstanceScript* is = player->GetInstanceScript()) { |