redss

erazare, <<<<<<< HEAD:src/game/RandomMovementGenerator.cpp if (creature.hasUnitState(UNIT_STAT_ROOT | UNIT_STAT_STUNNED | UNIT_STAT_DISTRACTED | UNIT_STAT_DIED)) ======= if(creature.hasUnitState(UNIT_STAT_ROOT | UNIT_STAT_STUNNED | UNIT_STAT_DISTRACTED | UNIT_STAT_DIED | UNIT_STAT_ON_VEHICLE)) >>>>>>> 14157813e9d4443a33602762fe44ba1a5682ee66:src/game/RandomMovementGenerator.cpp <<<<<<< HEAD:src/game/Spell.cpp case TARGET_AREAEFFECT_CUSTOM_2: ======= case TARGET_SUMMON: >>>>>>> 14157813e9d4443a33602762fe44ba1a5682ee66:src/game/Spell.cpp

50 objects were added to complete this thin pack. Auto-merged src/game/Creature.cpp Auto-merged src/game/GameObject.cpp Auto-merged src/game/Map.cpp Auto-merged src/game/Map.h Auto-merged src/game/MiscHandler.cpp Auto-merged src/game/MovementHandler.cpp Auto-merged src/game/ObjectMgr.cpp Auto-merged src/game/ObjectMgr.h Auto-merged src/game/Player.cpp Auto-merged src/game/RandomMovementGenerator.cpp CONFLICT (content): Merge conflict in src/game/RandomMovementGenerator.cpp Auto-merged src/game/SharedDefines.h Auto-merged src/game/Spell.cpp CONFLICT (content): Merge conflict in src/game/Spell.cpp Auto-merged src/game/Spell.h Auto-merged src/game/SpellAuras.cpp Auto-merged src/game/SpellEffects.cpp Auto-merged src/game/Unit.cpp Automatic merge failed; fix conflicts and then commit the result. With last mangos rev