diff options
| author | Nay <dnpd.dd@gmail.com> | 2012-09-30 15:33:56 +0100 |
|---|---|---|
| committer | Nay <dnpd.dd@gmail.com> | 2012-09-30 15:33:56 +0100 |
| commit | 8a18449a74abcf2322dd45f87ec29d3bf05fedcd (patch) | |
| tree | f033a0abf0b02da74dcd8d455c3bc6efe2b40f47 /src/server/game | |
| parent | 31901e57b9b30eb5d0afe2b7a6fe15e73e3bc139 (diff) | |
SQL: Rename file merged in PR; Core: cleanup whitespace and tabs
Diffstat (limited to 'src/server/game')
| -rw-r--r-- | src/server/game/Battlefield/Zones/BattlefieldWG.cpp | 4 | ||||
| -rwxr-xr-x | src/server/game/Entities/Unit/Unit.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/server/game/Battlefield/Zones/BattlefieldWG.cpp b/src/server/game/Battlefield/Zones/BattlefieldWG.cpp index 0da2a9ca06c..de1ee1785d8 100644 --- a/src/server/game/Battlefield/Zones/BattlefieldWG.cpp +++ b/src/server/game/Battlefield/Zones/BattlefieldWG.cpp @@ -876,9 +876,9 @@ void BattlefieldWG::SendInitWorldStatesTo(Player* player) data << uint32(m_ZoneId); data << uint32(0); data << uint16(10 + BuildingsInZone.size() + WorkshopsList.size()); // Number of fields - + FillInitialWorldStates(data); - + player->GetSession()->SendPacket(&data); } diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index 3e9ab113918..0a3876c6946 100755 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -6673,7 +6673,7 @@ bool Unit::HandleDummyAuraProc(Unit* victim, uint32 damage, AuraEffect* triggere { victim->CastCustomSpell(beaconTarget, triggered_spell_id, &basepoints0, NULL, NULL, true, 0, triggeredByAura); return true; - } + } else return false; } |
