diff options
| author | Machiavelli <machiavelli.trinity@gmail.com> | 2011-02-22 01:04:56 +0100 |
|---|---|---|
| committer | Machiavelli <machiavelli.trinity@gmail.com> | 2011-02-22 01:04:56 +0100 |
| commit | 8b738d537c9a125dc91979d93c00d822264b1a07 (patch) | |
| tree | a87ffd11ff306b66323dfcc20d742ac81a2f59b8 | |
| parent | 8b37ac4688e8a376cf0a1307f86a9b91df3e4af7 (diff) | |
Core/Units: Remove hack that caused units with UNIT_STAT_ON_VEHICLE to absorb any incoming damage.
| -rwxr-xr-x | src/server/game/Entities/Unit/Unit.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index 1ad52613687..6f1be60e84e 100755 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -515,7 +515,7 @@ bool Unit::HasAuraTypeWithFamilyFlags(AuraType auraType, uint32 familyName, uint void Unit::DealDamageMods(Unit *pVictim, uint32 &damage, uint32* absorb) { - if (!pVictim->isAlive() || pVictim->HasUnitState(UNIT_STAT_IN_FLIGHT) || (pVictim->HasUnitState(UNIT_STAT_ONVEHICLE) && pVictim->GetVehicleBase() != this) || (pVictim->GetTypeId() == TYPEID_UNIT && pVictim->ToCreature()->IsInEvadeMode())) + if (!pVictim->isAlive() || pVictim->HasUnitState(UNIT_STAT_IN_FLIGHT) || (pVictim->GetTypeId() == TYPEID_UNIT && pVictim->ToCreature()->IsInEvadeMode())) { if (absorb) *absorb += damage; |