diff options
| author | Subv <subv2112@gmail.com> | 2013-10-19 21:20:21 -0700 |
|---|---|---|
| committer | Subv <subv2112@gmail.com> | 2013-10-19 21:20:21 -0700 |
| commit | 6534df846426197355eebd8d6715c13031613b2f (patch) | |
| tree | 83d301f06f4247b91afa3bc4340444902d08031e /src | |
| parent | faa23e118a484f1195a1caaa49f589d40ceaa5b3 (diff) | |
| parent | 7223adb0a0801ff46112ffd50826ee2fbef7cf69 (diff) | |
Merge pull request #11070 from gerripeach/pets
Core/Pet: Allow all pets to swim
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/game/Entities/Creature/Creature.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/game/Entities/Creature/Creature.h b/src/server/game/Entities/Creature/Creature.h index a555469da63..4f43305c54f 100644 --- a/src/server/game/Entities/Creature/Creature.h +++ b/src/server/game/Entities/Creature/Creature.h @@ -447,7 +447,7 @@ class Creature : public Unit, public GridObject<Creature>, public MapObject bool IsTrigger() const { return GetCreatureTemplate()->flags_extra & CREATURE_FLAG_EXTRA_TRIGGER; } bool IsGuard() const { return GetCreatureTemplate()->flags_extra & CREATURE_FLAG_EXTRA_GUARD; } bool CanWalk() const { return GetCreatureTemplate()->InhabitType & INHABIT_GROUND; } - bool CanSwim() const { return GetCreatureTemplate()->InhabitType & INHABIT_WATER; } + bool CanSwim() const { return GetCreatureTemplate()->InhabitType & INHABIT_WATER || IsPet(); } bool CanFly() const { return GetCreatureTemplate()->InhabitType & INHABIT_AIR; } void SetReactState(ReactStates st) { m_reactState = st; } |