Correctly redo file moves/renames from rev. 8416.

--HG--
branch : trunk
rename : src/server/game/AuctionHouseBot.cpp => src/server/game/AI/AuctionHouseBot/AuctionHouseBot.cpp
rename : src/server/game/AuctionHouseBot.h => src/server/game/AI/AuctionHouseBot/AuctionHouseBot.h
rename : src/server/game/CombatAI.cpp => src/server/game/AI/CombatAI.cpp
rename : src/server/game/CombatAI.h => src/server/game/AI/CombatAI.h
rename : src/server/game/CreatureAI.cpp => src/server/game/AI/CreatureAI.cpp
rename : src/server/game/CreatureAI.h => src/server/game/AI/CreatureAI.h
rename : src/server/game/CreatureAIFactory.h => src/server/game/AI/CreatureAIFactory.h
rename : src/server/game/CreatureAIImpl.h => src/server/game/AI/CreatureAIImpl.h
rename : src/server/game/CreatureAIRegistry.cpp => src/server/game/AI/CreatureAIRegistry.cpp
rename : src/server/game/CreatureAIRegistry.h => src/server/game/AI/CreatureAIRegistry.h
rename : src/server/game/CreatureAISelector.cpp => src/server/game/AI/CreatureAISelector.cpp
rename : src/server/game/CreatureAISelector.h => src/server/game/AI/CreatureAISelector.h
rename : src/server/game/CreatureEventAI.cpp => src/server/game/AI/EventAI/CreatureEventAI.cpp
rename : src/server/game/CreatureEventAI.h => src/server/game/AI/EventAI/CreatureEventAI.h
rename : src/server/game/CreatureEventAIMgr.cpp => src/server/game/AI/EventAI/CreatureEventAIMgr.cpp
rename : src/server/game/CreatureEventAIMgr.h => src/server/game/AI/EventAI/CreatureEventAIMgr.h
rename : src/server/game/GuardAI.cpp => src/server/game/AI/GuardAI.cpp
rename : src/server/game/GuardAI.h => src/server/game/AI/GuardAI.h
rename : src/server/game/PassiveAI.cpp => src/server/game/AI/PassiveAI.cpp
rename : src/server/game/PassiveAI.h => src/server/game/AI/PassiveAI.h
rename : src/server/game/PetAI.cpp => src/server/game/AI/PetAI.cpp
rename : src/server/game/PetAI.h => src/server/game/AI/PetAI.h
rename : src/server/game/ReactorAI.cpp => src/server/game/AI/ReactorAI.cpp
rename : src/server/game/ReactorAI.h => src/server/game/AI/ReactorAI.h
rename : src/server/game/ScriptedCreature.cpp => src/server/game/AI/ScriptedAI/ScriptedCreature.cpp
rename : src/server/game/ScriptedCreature.h => src/server/game/AI/ScriptedAI/ScriptedCreature.h
rename : src/server/game/ScriptedEscortAI.cpp => src/server/game/AI/ScriptedAI/ScriptedEscortAI.cpp
rename : src/server/game/ScriptedEscortAI.h => src/server/game/AI/ScriptedAI/ScriptedEscortAI.h
rename : src/server/game/ScriptedFollowerAI.cpp => src/server/game/AI/ScriptedAI/ScriptedFollowerAI.cpp
rename : src/server/game/ScriptedFollowerAI.h => src/server/game/AI/ScriptedAI/ScriptedFollowerAI.h
rename : src/server/game/ScriptedGossip.h => src/server/game/AI/ScriptedAI/ScriptedGossip.h
rename : src/server/game/ScriptedGuardAI.cpp => src/server/game/AI/ScriptedAI/ScriptedGuardAI.cpp
rename : src/server/game/ScriptedGuardAI.h => src/server/game/AI/ScriptedAI/ScriptedGuardAI.h
rename : src/server/game/ScriptedInstance.h => src/server/game/AI/ScriptedAI/ScriptedInstance.h
rename : src/server/game/ScriptedSimpleAI.cpp => src/server/game/AI/ScriptedAI/ScriptedSimpleAI.cpp
rename : src/server/game/ScriptedSimpleAI.h => src/server/game/AI/ScriptedAI/ScriptedSimpleAI.h
rename : src/server/game/ScriptedSmartAI.cpp => src/server/game/AI/ScriptedAI/ScriptedSmartAI.cpp
rename : src/server/game/ScriptedSmartAI.h => src/server/game/AI/ScriptedAI/ScriptedSmartAI.h
rename : src/server/game/TotemAI.cpp => src/server/game/AI/TotemAI.cpp
rename : src/server/game/TotemAI.h => src/server/game/AI/TotemAI.h
rename : src/server/game/UnitAI.cpp => src/server/game/AI/UnitAI.cpp
rename : src/server/game/UnitAI.h => src/server/game/AI/UnitAI.h
rename : src/server/game/AccountMgr.cpp => src/server/game/Account/AccountMgr.cpp
rename : src/server/game/AccountMgr.h => src/server/game/Account/AccountMgr.h
rename : src/server/game/AchievementMgr.cpp => src/server/game/Achievements/AchievementMgr.cpp
rename : src/server/game/AchievementMgr.h => src/server/game/Achievements/AchievementMgr.h
rename : src/server/game/AddonHandler.cpp => src/server/game/Addons/AddonHandler.cpp
rename : src/server/game/AddonHandler.h => src/server/game/Addons/AddonHandler.h
rename : src/server/game/AddonMgr.cpp => src/server/game/Addons/AddonMgr.cpp
rename : src/server/game/AddonMgr.h => src/server/game/Addons/AddonMgr.h
rename : src/server/game/AuctionHouseHandler.cpp => src/server/game/AuctionHouse/AuctionHouseHandler.cpp
rename : src/server/game/AuctionHouseMgr.cpp => src/server/game/AuctionHouse/AuctionHouseMgr.cpp
rename : src/server/game/AuctionHouseMgr.h => src/server/game/AuctionHouse/AuctionHouseMgr.h
rename : src/server/game/ArenaTeam.cpp => src/server/game/BattleGrounds/ArenaTeam.cpp
rename : src/server/game/ArenaTeam.h => src/server/game/BattleGrounds/ArenaTeam.h
rename : src/server/game/ArenaTeamHandler.cpp => src/server/game/BattleGrounds/ArenaTeamHandler.cpp
rename : src/server/game/BattleGround.cpp => src/server/game/BattleGrounds/BattleGround.cpp
rename : src/server/game/BattleGround.h => src/server/game/BattleGrounds/BattleGround.h
rename : src/server/game/BattleGroundAA.cpp => src/server/game/BattleGrounds/BattleGroundAA.cpp
rename : src/server/game/BattleGroundAA.h => src/server/game/BattleGrounds/BattleGroundAA.h
rename : src/server/game/BattleGroundAB.cpp => src/server/game/BattleGrounds/BattleGroundAB.cpp
rename : src/server/game/BattleGroundAB.h => src/server/game/BattleGrounds/BattleGroundAB.h
rename : src/server/game/BattleGroundAV.cpp => src/server/game/BattleGrounds/BattleGroundAV.cpp
rename : src/server/game/BattleGroundAV.h => src/server/game/BattleGrounds/BattleGroundAV.h
rename : src/server/game/BattleGroundBE.cpp => src/server/game/BattleGrounds/BattleGroundBE.cpp
rename : src/server/game/BattleGroundBE.h => src/server/game/BattleGrounds/BattleGroundBE.h
rename : src/server/game/BattleGroundDS.cpp => src/server/game/BattleGrounds/BattleGroundDS.cpp
rename : src/server/game/BattleGroundDS.h => src/server/game/BattleGrounds/BattleGroundDS.h
rename : src/server/game/BattleGroundEY.cpp => src/server/game/BattleGrounds/BattleGroundEY.cpp
rename : src/server/game/BattleGroundEY.h => src/server/game/BattleGrounds/BattleGroundEY.h
rename : src/server/game/BattleGroundHandler.cpp => src/server/game/BattleGrounds/BattleGroundHandler.cpp
rename : src/server/game/BattleGroundIC.cpp => src/server/game/BattleGrounds/BattleGroundIC.cpp
rename : src/server/game/BattleGroundIC.h => src/server/game/BattleGrounds/BattleGroundIC.h
rename : src/server/game/BattleGroundMgr.cpp => src/server/game/BattleGrounds/BattleGroundMgr.cpp
rename : src/server/game/BattleGroundMgr.h => src/server/game/BattleGrounds/BattleGroundMgr.h
rename : src/server/game/BattleGroundNA.cpp => src/server/game/BattleGrounds/BattleGroundNA.cpp
rename : src/server/game/BattleGroundNA.h => src/server/game/BattleGrounds/BattleGroundNA.h
rename : src/server/game/BattleGroundRB.cpp => src/server/game/BattleGrounds/BattleGroundRB.cpp
rename : src/server/game/BattleGroundRB.h => src/server/game/BattleGrounds/BattleGroundRB.h
rename : src/server/game/BattleGroundRL.cpp => src/server/game/BattleGrounds/BattleGroundRL.cpp
rename : src/server/game/BattleGroundRL.h => src/server/game/BattleGrounds/BattleGroundRL.h
rename : src/server/game/BattleGroundRV.cpp => src/server/game/BattleGrounds/BattleGroundRV.cpp
rename : src/server/game/BattleGroundRV.h => src/server/game/BattleGrounds/BattleGroundRV.h
rename : src/server/game/BattleGroundSA.cpp => src/server/game/BattleGrounds/BattleGroundSA.cpp
rename : src/server/game/BattleGroundSA.h => src/server/game/BattleGrounds/BattleGroundSA.h
rename : src/server/game/BattleGroundWS.cpp => src/server/game/BattleGrounds/BattleGroundWS.cpp
rename : src/server/game/BattleGroundWS.h => src/server/game/BattleGrounds/BattleGroundWS.h
rename : src/server/game/Calendar.cpp => src/server/game/Calender/Calendar.cpp
rename : src/server/game/Calendar.h => src/server/game/Calender/Calendar.h
rename : src/server/game/CalendarHandler.cpp => src/server/game/Calender/CalendarHandler.cpp
rename : src/server/game/Channel.cpp => src/server/game/Chat/Channel.cpp
rename : src/server/game/Channel.h => src/server/game/Chat/Channel.h
rename : src/server/game/ChannelHandler.cpp => src/server/game/Chat/ChannelHandler.cpp
rename : src/server/game/ChannelMgr.cpp => src/server/game/Chat/ChannelMgr.cpp
rename : src/server/game/ChannelMgr.h => src/server/game/Chat/ChannelMgr.h
rename : src/server/game/Chat.cpp => src/server/game/Chat/Chat.cpp
rename : src/server/game/Chat.h => src/server/game/Chat/Chat.h
rename : src/server/game/ChatHandler.cpp => src/server/game/Chat/ChatHandler.cpp
rename : src/server/game/Debugcmds.cpp => src/server/game/Chat/Debugcmds.cpp
rename : src/server/game/Level0.cpp => src/server/game/Chat/Level0.cpp
rename : src/server/game/Level1.cpp => src/server/game/Chat/Level1.cpp
rename : src/server/game/Level2.cpp => src/server/game/Chat/Level2.cpp
rename : src/server/game/Level3.cpp => src/server/game/Chat/Level3.cpp
rename : src/server/game/CombatHandler.cpp => src/server/game/Combat/CombatHandler.cpp
rename : src/server/game/HostileRefManager.cpp => src/server/game/Combat/HostileRefManager.cpp
rename : src/server/game/HostileRefManager.h => src/server/game/Combat/HostileRefManager.h
rename : src/server/game/ThreatManager.cpp => src/server/game/Combat/ThreatManager.cpp
rename : src/server/game/ThreatManager.h => src/server/game/Combat/ThreatManager.h
rename : src/server/game/ConditionMgr.cpp => src/server/game/ConditionMgr/ConditionMgr.cpp
rename : src/server/game/ConditionMgr.h => src/server/game/ConditionMgr/ConditionMgr.h
rename : src/server/game/DBCEnums.h => src/server/game/DataStores/DBCEnums.h
rename : src/server/game/DBCStores.cpp => src/server/game/DataStores/DBCStores.cpp
rename : src/server/game/DBCStores.h => src/server/game/DataStores/DBCStores.h
rename : src/server/game/DBCStructure.h => src/server/game/DataStores/DBCStructure.h
rename : src/server/game/DBCfmt.h => src/server/game/DataStores/DBCfmt.h
rename : src/server/game/Creature.cpp => src/server/game/Entities/Creature/Creature.cpp
rename : src/server/game/Creature.h => src/server/game/Entities/Creature/Creature.h
rename : src/server/game/CreatureGroups.cpp => src/server/game/Entities/Creature/CreatureGroups.cpp
rename : src/server/game/CreatureGroups.h => src/server/game/Entities/Creature/CreatureGroups.h
rename : src/server/game/GossipDef.cpp => src/server/game/Entities/Creature/GossipDef.cpp
rename : src/server/game/GossipDef.h => src/server/game/Entities/Creature/GossipDef.h
rename : src/server/game/NPCHandler.cpp => src/server/game/Entities/Creature/NPCHandler.cpp
rename : src/server/game/NPCHandler.h => src/server/game/Entities/Creature/NPCHandler.h
rename : src/server/game/TemporarySummon.cpp => src/server/game/Entities/Creature/TemporarySummon.cpp
rename : src/server/game/TemporarySummon.h => src/server/game/Entities/Creature/TemporarySummon.h
rename : src/server/game/GameObject.cpp => src/server/game/Entities/GameObject/GameObject.cpp
rename : src/server/game/GameObject.h => src/server/game/Entities/GameObject/GameObject.h
rename : src/server/game/Bag.cpp => src/server/game/Entities/Item/Bag.cpp
rename : src/server/game/Bag.h => src/server/game/Entities/Item/Bag.h
rename : src/server/game/Item.cpp => src/server/game/Entities/Item/Item.cpp
rename : src/server/game/Item.h => src/server/game/Entities/Item/Item.h
rename : src/server/game/ItemEnchantmentMgr.cpp => src/server/game/Entities/Item/ItemEnchantmentMgr.cpp
rename : src/server/game/ItemEnchantmentMgr.h => src/server/game/Entities/Item/ItemEnchantmentMgr.h
rename : src/server/game/ItemHandler.cpp => src/server/game/Entities/Item/ItemHandler.cpp
rename : src/server/game/ItemPrototype.h => src/server/game/Entities/Item/ItemPrototype.h
rename : src/server/game/Corpse.cpp => src/server/game/Entities/Object/Corpse.cpp
rename : src/server/game/Corpse.h => src/server/game/Entities/Object/Corpse.h
rename : src/server/game/DynamicObject.cpp => src/server/game/Entities/Object/DynamicObject.cpp
rename : src/server/game/DynamicObject.h => src/server/game/Entities/Object/DynamicObject.h
rename : src/server/game/Object.cpp => src/server/game/Entities/Object/Object.cpp
rename : src/server/game/Object.h => src/server/game/Entities/Object/Object.h
rename : src/server/game/ObjectAccessor.cpp => src/server/game/Entities/Object/ObjectAccessor.cpp
rename : src/server/game/ObjectAccessor.h => src/server/game/Entities/Object/ObjectAccessor.h
rename : src/server/game/ObjectDefines.h => src/server/game/Entities/Object/ObjectDefines.h
rename : src/server/game/ObjectMgr.cpp => src/server/game/Entities/Object/ObjectMgr.cpp
rename : src/server/game/ObjectMgr.h => src/server/game/Entities/Object/ObjectMgr.h
rename : src/server/game/UpdateData.cpp => src/server/game/Entities/Object/UpdateData.cpp
rename : src/server/game/UpdateData.h => src/server/game/Entities/Object/UpdateData.h
rename : src/server/game/UpdateFields.h => src/server/game/Entities/Object/UpdateFields.h
rename : src/server/game/UpdateMask.h => src/server/game/Entities/Object/UpdateMask.h
rename : src/server/game/Pet.cpp => src/server/game/Entities/Pet/Pet.cpp
rename : src/server/game/Pet.h => src/server/game/Entities/Pet/Pet.h
rename : src/server/game/PetHandler.cpp => src/server/game/Entities/Pet/PetHandler.cpp
rename : src/server/game/CharacterHandler.cpp => src/server/game/Entities/Player/CharacterHandler.cpp
rename : src/server/game/DuelHandler.cpp => src/server/game/Entities/Player/DuelHandler.cpp
rename : src/server/game/MiscHandler.cpp => src/server/game/Entities/Player/MiscHandler.cpp
rename : src/server/game/PetitionsHandler.cpp => src/server/game/Entities/Player/PetitionsHandler.cpp
rename : src/server/game/Player.cpp => src/server/game/Entities/Player/Player.cpp
rename : src/server/game/Player.h => src/server/game/Entities/Player/Player.h
rename : src/server/game/SocialMgr.cpp => src/server/game/Entities/Player/SocialMgr.cpp
rename : src/server/game/SocialMgr.h => src/server/game/Entities/Player/SocialMgr.h
rename : src/server/game/TicketHandler.cpp => src/server/game/Entities/Player/TicketHandler.cpp
rename : src/server/game/TradeHandler.cpp => src/server/game/Entities/Player/TradeHandler.cpp
rename : src/server/game/VoiceChatHandler.cpp => src/server/game/Entities/Player/VoiceChatHandler.cpp
rename : src/server/game/Totem.cpp => src/server/game/Entities/Totem/Totem.cpp
rename : src/server/game/Totem.h => src/server/game/Entities/Totem/Totem.h
rename : src/server/game/StatSystem.cpp => src/server/game/Entities/Unit/StatSystem.cpp
rename : src/server/game/Unit.cpp => src/server/game/Entities/Unit/Unit.cpp
rename : src/server/game/Unit.h => src/server/game/Entities/Unit/Unit.h
rename : src/server/game/Vehicle.cpp => src/server/game/Entities/Vehicle/Vehicle.cpp
rename : src/server/game/Vehicle.h => src/server/game/Entities/Vehicle/Vehicle.h
rename : src/server/game/GameEventMgr.cpp => src/server/game/Events/GameEventMgr.cpp
rename : src/server/game/GameEventMgr.h => src/server/game/Events/GameEventMgr.h
rename : src/server/game/GlobalEvents.cpp => src/server/game/Events/GlobalEvents.cpp
rename : src/server/game/GlobalEvents.h => src/server/game/Events/GlobalEvents.h
rename : src/server/game/UnitEvents.h => src/server/game/Events/UnitEvents.h
rename : src/server/game/Formulas.h => src/server/game/Globals/Formulas.h
rename : src/server/game/Language.h => src/server/game/Globals/Language.h
rename : src/server/game/SharedDefines.h => src/server/game/Globals/SharedDefines.h
rename : src/server/game/Group.cpp => src/server/game/Groups/Group.cpp
rename : src/server/game/Group.h => src/server/game/Groups/Group.h
rename : src/server/game/GroupHandler.cpp => src/server/game/Groups/GroupHandler.cpp
rename : src/server/game/GroupRefManager.h => src/server/game/Groups/GroupRefManager.h
rename : src/server/game/GroupReference.cpp => src/server/game/Groups/GroupReference.cpp
rename : src/server/game/GroupReference.h => src/server/game/Groups/GroupReference.h
rename : src/server/game/Guild.cpp => src/server/game/Guilds/Guild.cpp
rename : src/server/game/Guild.h => src/server/game/Guilds/Guild.h
rename : src/server/game/GuildHandler.cpp => src/server/game/Guilds/GuildHandler.cpp
rename : src/server/game/InstanceData.cpp => src/server/game/Instances/InstanceData.cpp
rename : src/server/game/InstanceData.h => src/server/game/Instances/InstanceData.h
rename : src/server/game/InstanceSaveMgr.cpp => src/server/game/Instances/InstanceSaveMgr.cpp
rename : src/server/game/InstanceSaveMgr.h => src/server/game/Instances/InstanceSaveMgr.h
rename : src/server/game/LFG.h => src/server/game/LookingForGroup/LFG.h
rename : src/server/game/LFGHandler.cpp => src/server/game/LookingForGroup/LFGHandler.cpp
rename : src/server/game/LFGMgr.cpp => src/server/game/LookingForGroup/LFGMgr.cpp
rename : src/server/game/LFGMgr.h => src/server/game/LookingForGroup/LFGMgr.h
rename : src/server/game/LootHandler.cpp => src/server/game/Loot/LootHandler.cpp
rename : src/server/game/LootMgr.cpp => src/server/game/Loot/LootMgr.cpp
rename : src/server/game/LootMgr.h => src/server/game/Loot/LootMgr.h
rename : src/server/game/Mail.cpp => src/server/game/Mails/Mail.cpp
rename : src/server/game/Mail.h => src/server/game/Mails/Mail.h
rename : src/server/game/Cell.h => src/server/game/Map/Cell/Cell.h
rename : src/server/game/CellImpl.h => src/server/game/Map/Cell/CellImpl.h
rename : src/server/game/GridDefines.h => src/server/game/Map/Grid/GridDefines.h
rename : src/server/game/GridNotifiers.cpp => src/server/game/Map/Grid/GridNotifiers.cpp
rename : src/server/game/GridNotifiers.h => src/server/game/Map/Grid/GridNotifiers.h
rename : src/server/game/GridNotifiersImpl.h => src/server/game/Map/Grid/GridNotifiersImpl.h
rename : src/server/game/GridStates.cpp => src/server/game/Map/Grid/GridStates.cpp
rename : src/server/game/GridStates.h => src/server/game/Map/Grid/GridStates.h
rename : src/server/game/ObjectGridLoader.cpp => src/server/game/Map/Grid/ObjectGridLoader.cpp
rename : src/server/game/ObjectGridLoader.h => src/server/game/Map/Grid/ObjectGridLoader.h
rename : src/server/game/Map.cpp => src/server/game/Map/Map.cpp
rename : src/server/game/Map.h => src/server/game/Map/Map.h
rename : src/server/game/MapInstanced.cpp => src/server/game/Map/MapInstanced.cpp
rename : src/server/game/MapInstanced.h => src/server/game/Map/MapInstanced.h
rename : src/server/game/MapManager.cpp => src/server/game/Map/MapManager.cpp
rename : src/server/game/MapManager.h => src/server/game/Map/MapManager.h
rename : src/server/game/MapRefManager.h => src/server/game/Map/MapRefManager.h
rename : src/server/game/MapReference.h => src/server/game/Map/MapReference.h
rename : src/server/game/MapUpdater.cpp => src/server/game/Map/MapUpdater.cpp
rename : src/server/game/MapUpdater.h => src/server/game/Map/MapUpdater.h
rename : src/server/game/ObjectPosSelector.cpp => src/server/game/Map/ObjectPosSelector.cpp
rename : src/server/game/ObjectPosSelector.h => src/server/game/Map/ObjectPosSelector.h
rename : src/server/game/ZoneScript.h => src/server/game/Map/ZoneScript.h
rename : src/server/game/DestinationHolder.cpp => src/server/game/Movement/DestinationHolder.cpp
rename : src/server/game/DestinationHolder.h => src/server/game/Movement/DestinationHolder.h
rename : src/server/game/DestinationHolderImp.h => src/server/game/Movement/DestinationHolderImp.h
rename : src/server/game/FollowerRefManager.h => src/server/game/Movement/FollowerRefManager.h
rename : src/server/game/FollowerReference.cpp => src/server/game/Movement/FollowerReference.cpp
rename : src/server/game/FollowerReference.h => src/server/game/Movement/FollowerReference.h
rename : src/server/game/MotionMaster.cpp => src/server/game/Movement/MotionMaster.cpp
rename : src/server/game/MotionMaster.h => src/server/game/Movement/MotionMaster.h
rename : src/server/game/ConfusedMovementGenerator.cpp => src/server/game/Movement/MovementGenerators/ConfusedMovementGenerator.cpp
rename : src/server/game/ConfusedMovementGenerator.h => src/server/game/Movement/MovementGenerators/ConfusedMovementGenerator.h
rename : src/server/game/FleeingMovementGenerator.cpp => src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.cpp
rename : src/server/game/FleeingMovementGenerator.h => src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.h
rename : src/server/game/HomeMovementGenerator.cpp => src/server/game/Movement/MovementGenerators/HomeMovementGenerator.cpp
rename : src/server/game/HomeMovementGenerator.h => src/server/game/Movement/MovementGenerators/HomeMovementGenerator.h
rename : src/server/game/IdleMovementGenerator.cpp => src/server/game/Movement/MovementGenerators/IdleMovementGenerator.cpp
rename : src/server/game/IdleMovementGenerator.h => src/server/game/Movement/MovementGenerators/IdleMovementGenerator.h
rename : src/server/game/MovementGenerator.cpp => src/server/game/Movement/MovementGenerators/MovementGenerator.cpp
rename : src/server/game/MovementGenerator.h => src/server/game/Movement/MovementGenerators/MovementGenerator.h
rename : src/server/game/MovementGeneratorImpl.h => src/server/game/Movement/MovementGenerators/MovementGeneratorImpl.h
rename : src/server/game/PointMovementGenerator.cpp => src/server/game/Movement/MovementGenerators/PointMovementGenerator.cpp
rename : src/server/game/PointMovementGenerator.h => src/server/game/Movement/MovementGenerators/PointMovementGenerator.h
rename : src/server/game/RandomMovementGenerator.cpp => src/server/game/Movement/MovementGenerators/RandomMovementGenerator.cpp
rename : src/server/game/RandomMovementGenerator.h => src/server/game/Movement/MovementGenerators/RandomMovementGenerator.h
rename : src/server/game/TargetedMovementGenerator.cpp => src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.cpp
rename : src/server/game/TargetedMovementGenerator.h => src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.h
rename : src/server/game/WaypointMovementGenerator.cpp => src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp
rename : src/server/game/WaypointMovementGenerator.h => src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.h
rename : src/server/game/MovementHandler.cpp => src/server/game/Movement/MovementHandler.cpp
rename : src/server/game/Path.h => src/server/game/Movement/Path.h
rename : src/server/game/TaxiHandler.cpp => src/server/game/Movement/TaxiHandler.cpp
rename : src/server/game/Transports.cpp => src/server/game/Movement/Transports.cpp
rename : src/server/game/Transports.h => src/server/game/Movement/Transports.h
rename : src/server/game/Traveller.h => src/server/game/Movement/Traveller.h
rename : src/server/game/WaypointManager.cpp => src/server/game/Movement/WaypointManager.cpp
rename : src/server/game/WaypointManager.h => src/server/game/Movement/WaypointManager.h
rename : src/server/game/Opcodes.cpp => src/server/game/Opcodes/Opcodes.cpp
rename : src/server/game/Opcodes.h => src/server/game/Opcodes/Opcodes.h
rename : src/server/game/OutdoorPvP.cpp => src/server/game/OutdoorPvP/OutdoorPvP.cpp
rename : src/server/game/OutdoorPvP.h => src/server/game/OutdoorPvP/OutdoorPvP.h
rename : src/server/game/OutdoorPvPEP.cpp => src/server/game/OutdoorPvP/OutdoorPvPEP.cpp
rename : src/server/game/OutdoorPvPEP.h => src/server/game/OutdoorPvP/OutdoorPvPEP.h
rename : src/server/game/OutdoorPvPHP.cpp => src/server/game/OutdoorPvP/OutdoorPvPHP.cpp
rename : src/server/game/OutdoorPvPHP.h => src/server/game/OutdoorPvP/OutdoorPvPHP.h
rename : src/server/game/OutdoorPvPImpl.h => src/server/game/OutdoorPvP/OutdoorPvPImpl.h
rename : src/server/game/OutdoorPvPMgr.cpp => src/server/game/OutdoorPvP/OutdoorPvPMgr.cpp
rename : src/server/game/OutdoorPvPMgr.h => src/server/game/OutdoorPvP/OutdoorPvPMgr.h
rename : src/server/game/OutdoorPvPNA.cpp => src/server/game/OutdoorPvP/OutdoorPvPNA.cpp
rename : src/server/game/OutdoorPvPNA.h => src/server/game/OutdoorPvP/OutdoorPvPNA.h
rename : src/server/game/OutdoorPvPSI.cpp => src/server/game/OutdoorPvP/OutdoorPvPSI.cpp
rename : src/server/game/OutdoorPvPSI.h => src/server/game/OutdoorPvP/OutdoorPvPSI.h
rename : src/server/game/OutdoorPvPTF.cpp => src/server/game/OutdoorPvP/OutdoorPvPTF.cpp
rename : src/server/game/OutdoorPvPTF.h => src/server/game/OutdoorPvP/OutdoorPvPTF.h
rename : src/server/game/OutdoorPvPZM.cpp => src/server/game/OutdoorPvP/OutdoorPvPZM.cpp
rename : src/server/game/OutdoorPvPZM.h => src/server/game/OutdoorPvP/OutdoorPvPZM.h
rename : src/server/game/PoolHandler.cpp => src/server/game/Pools/PoolHandler.cpp
rename : src/server/game/PoolHandler.h => src/server/game/Pools/PoolHandler.h
rename : src/server/game/pchdef.cpp => src/server/game/PrecompiledHeaders/pchdef.cpp
rename : src/server/game/pchdef.h => src/server/game/PrecompiledHeaders/pchdef.h
rename : src/server/game/pchlinux.cpp => src/server/game/PrecompiledHeaders/pchlinux.cpp
rename : src/server/game/pchlinux.h => src/server/game/PrecompiledHeaders/pchlinux.h
rename : src/server/game/QueryHandler.cpp => src/server/game/Quests/QueryHandler.cpp
rename : src/server/game/QuestDef.cpp => src/server/game/Quests/QuestDef.cpp
rename : src/server/game/QuestDef.h => src/server/game/Quests/QuestDef.h
rename : src/server/game/QuestHandler.cpp => src/server/game/Quests/QuestHandler.cpp
rename : src/server/game/ReputationMgr.cpp => src/server/game/Reputation/ReputationMgr.cpp
rename : src/server/game/ReputationMgr.h => src/server/game/Reputation/ReputationMgr.h
rename : src/server/game/ScriptLoader.cpp => src/server/game/ScriptMgr/ScriptLoader.cpp
rename : src/server/game/ScriptLoader.h => src/server/game/ScriptMgr/ScriptLoader.h
rename : src/server/game/ScriptMgr.cpp => src/server/game/ScriptMgr/ScriptMgr.cpp
rename : src/server/game/ScriptMgr.h => src/server/game/ScriptMgr/ScriptMgr.h
rename : src/server/game/ScriptSystem.cpp => src/server/game/ScriptMgr/ScriptSystem.cpp
rename : src/server/game/ScriptSystem.h => src/server/game/ScriptMgr/ScriptSystem.h
rename : src/server/game/ScriptedPch.cpp => src/server/game/ScriptMgr/ScriptedPch.cpp
rename : src/server/game/ScriptedPch.h => src/server/game/ScriptMgr/ScriptedPch.h
rename : src/server/game/SkillDiscovery.cpp => src/server/game/Skills/SkillDiscovery.cpp
rename : src/server/game/SkillDiscovery.h => src/server/game/Skills/SkillDiscovery.h
rename : src/server/game/SkillExtraItems.cpp => src/server/game/Skills/SkillExtraItems.cpp
rename : src/server/game/SkillExtraItems.h => src/server/game/Skills/SkillExtraItems.h
rename : src/server/game/SkillHandler.cpp => src/server/game/Skills/SkillHandler.cpp
rename : src/server/game/SpellAuraDefines.h => src/server/game/Spells/Auras/SpellAuraDefines.h
rename : src/server/game/SpellAuraEffects.cpp => src/server/game/Spells/Auras/SpellAuraEffects.cpp
rename : src/server/game/SpellAuraEffects.h => src/server/game/Spells/Auras/SpellAuraEffects.h
rename : src/server/game/SpellAuras.cpp => src/server/game/Spells/Auras/SpellAuras.cpp
rename : src/server/game/SpellAuras.h => src/server/game/Spells/Auras/SpellAuras.h
rename : src/server/game/SpellEffects.cpp => src/server/game/Spells/Auras/SpellEffects.cpp
rename : src/server/game/Spell.cpp => src/server/game/Spells/Spell.cpp
rename : src/server/game/Spell.h => src/server/game/Spells/Spell.h
rename : src/server/game/SpellHandler.cpp => src/server/game/Spells/SpellHandler.cpp
rename : src/server/game/SpellMgr.cpp => src/server/game/Spells/SpellMgr.cpp
rename : src/server/game/SpellMgr.h => src/server/game/Spells/SpellMgr.h
rename : src/server/game/PlayerDump.cpp => src/server/game/Tools/PlayerDump.cpp
rename : src/server/game/PlayerDump.h => src/server/game/Tools/PlayerDump.h
rename : src/server/game/Tools.cpp => src/server/game/Tools/Tools.cpp
rename : src/server/game/Tools.h => src/server/game/Tools/Tools.h
rename : src/server/game/Weather.cpp => src/server/game/Weather/Weather.cpp
rename : src/server/game/Weather.h => src/server/game/Weather/Weather.h
rename : src/server/game/TimeMgr.cpp => src/server/game/World/TimeMgr.cpp
rename : src/server/game/TimeMgr.h => src/server/game/World/TimeMgr.h
rename : src/server/game/World.cpp => src/server/game/World/World.cpp
rename : src/server/game/World.h => src/server/game/World/World.h
rename : src/server/game/WorldLog.cpp => src/server/game/World/WorldLog.cpp
rename : src/server/game/WorldLog.h => src/server/game/World/WorldLog.h
rename : src/server/game/WorldSession.cpp => src/server/game/World/WorldSession.cpp
rename : src/server/game/WorldSession.h => src/server/game/World/WorldSession.h
rename : src/server/game/WorldSocket.cpp => src/server/game/World/WorldSocket.cpp
rename : src/server/game/WorldSocket.h => src/server/game/World/WorldSocket.h
rename : src/server/game/WorldSocketMgr.cpp => src/server/game/World/WorldSocketMgr.cpp
rename : src/server/game/WorldSocketMgr.h => src/server/game/World/WorldSocketMgr.h

1 files changed, 471 insertions, 0 deletions

diff --git a/src/server/game/AI/PetAI.cpp b/src/server/game/AI/PetAI.cpp
new file mode 100644
index 00000000000..09ec8fae53f
--- /dev/null
+++ b/src/server/game/AI/PetAI.cpp
@@ -0,0 +1,471 @@
+/*
+ * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
+ *
+ * Copyright (C) 2008-2010 Trinity <http://www.trinitycore.org/>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+#include "PetAI.h"
+#include "Errors.h"
+#include "Pet.h"
+#include "Player.h"
+#include "DBCStores.h"
+#include "Spell.h"
+#include "ObjectAccessor.h"
+#include "SpellMgr.h"
+#include "Creature.h"
+#include "World.h"
+#include "Util.h"
+
+int PetAI::Permissible(const Creature *creature)
+{
+    if (creature->isPet())
+        return PERMIT_BASE_SPECIAL;
+
+    return PERMIT_BASE_NO;
+}
+
+PetAI::PetAI(Creature *c) : CreatureAI(c), i_tracker(TIME_INTERVAL_LOOK)
+{
+    m_AllySet.clear();
+    UpdateAllies();
+}
+
+void PetAI::EnterEvadeMode()
+{
+}
+
+bool PetAI::_needToStop() const
+{
+    // This is needed for charmed creatures, as once their target was reset other effects can trigger threat
+    if (me->isCharmed() && me->getVictim() == me->GetCharmer())
+        return true;
+
+    return !me->canAttack(me->getVictim());
+}
+
+void PetAI::_stopAttack()
+{
+    if (!me->isAlive())
+    {
+        DEBUG_LOG("Creature stoped attacking cuz his dead [guid=%u]", me->GetGUIDLow());
+        me->GetMotionMaster()->Clear();
+        me->GetMotionMaster()->MoveIdle();
+        me->CombatStop();
+        me->getHostileRefManager().deleteReferences();
+
+        return;
+    }
+
+    me->AttackStop();
+    me->GetCharmInfo()->SetIsCommandAttack(false);
+    HandleReturnMovement();
+}
+
+void PetAI::UpdateAI(const uint32 diff)
+{
+    if (!me->isAlive())
+        return;
+
+    Unit* owner = me->GetCharmerOrOwner();
+
+    if (m_updateAlliesTimer <= diff)
+        // UpdateAllies self set update timer
+        UpdateAllies();
+    else
+        m_updateAlliesTimer -= diff;
+
+    // me->getVictim() can't be used for check in case stop fighting, me->getVictim() clear at Unit death etc.
+    if (me->getVictim())
+    {
+        if (_needToStop())
+        {
+            DEBUG_LOG("Pet AI stoped attacking [guid=%u]", me->GetGUIDLow());
+            _stopAttack();
+            return;
+        }
+
+        DoMeleeAttackIfReady();
+    }
+    else if (owner && me->GetCharmInfo()) //no victim
+    {
+        Unit *nextTarget = SelectNextTarget();
+
+        if (nextTarget)
+            AttackStart(nextTarget);
+        else
+            HandleReturnMovement();
+    }
+    else if (owner && !me->hasUnitState(UNIT_STAT_FOLLOW)) // no charm info and no victim
+        me->GetMotionMaster()->MoveFollow(owner,PET_FOLLOW_DIST, me->GetFollowAngle());
+
+    if (!me->GetCharmInfo())
+        return;
+
+    // Autocast (casted only in combat or persistent spells in any state)
+    if (me->GetGlobalCooldown() == 0 && !me->hasUnitState(UNIT_STAT_CASTING))
+    {
+        typedef std::vector<std::pair<Unit*, Spell*> > TargetSpellList;
+        TargetSpellList targetSpellStore;
+
+        for (uint8 i = 0; i < me->GetPetAutoSpellSize(); ++i)
+        {
+            uint32 spellID = me->GetPetAutoSpellOnPos(i);
+            if (!spellID)
+                continue;
+
+            SpellEntry const *spellInfo = sSpellStore.LookupEntry(spellID);
+            if (!spellInfo)
+                continue;
+
+            // ignore some combinations of combat state and combat/noncombat spells
+            if (!me->getVictim())
+            {
+                // ignore attacking spells, and allow only self/around spells
+                if (!IsPositiveSpell(spellInfo->Id))
+                    continue;
+
+                // non combat spells allowed
+                // only pet spells have IsNonCombatSpell and not fit this reqs:
+                // Consume Shadows, Lesser Invisibility, so ignore checks for its
+                if (!IsNonCombatSpell(spellInfo))
+                {
+                    // allow only spell without spell cost or with spell cost but not duration limit
+                    int32 duration = GetSpellDuration(spellInfo);
+                    if ((spellInfo->manaCost || spellInfo->ManaCostPercentage || spellInfo->manaPerSecond) && duration > 0)
+                        continue;
+
+                    // allow only spell without cooldown > duration
+                    int32 cooldown = GetSpellRecoveryTime(spellInfo);
+                    if (cooldown >= 0 && duration >= 0 && cooldown > duration)
+                        continue;
+                }
+            }
+            else
+            {
+                // just ignore non-combat spells
+                if (IsNonCombatSpell(spellInfo))
+                    continue;
+            }
+
+            Spell *spell = new Spell(me, spellInfo, false, 0);
+
+            // Fix to allow pets on STAY to autocast
+            if (me->getVictim() && _CanAttack(me->getVictim()) && spell->CanAutoCast(me->getVictim()))
+            {
+                targetSpellStore.push_back(std::make_pair<Unit*, Spell*>(me->getVictim(), spell));
+                continue;
+            }
+            else
+            {
+                bool spellUsed = false;
+                for (std::set<uint64>::const_iterator tar = m_AllySet.begin(); tar != m_AllySet.end(); ++tar)
+                {
+                    Unit* Target = ObjectAccessor::GetUnit(*me,*tar);
+
+                    //only buff targets that are in combat, unless the spell can only be cast while out of combat
+                    if (!Target)
+                        continue;
+
+                    if (spell->CanAutoCast(Target))
+                    {
+                        targetSpellStore.push_back(std::make_pair<Unit*, Spell*>(Target, spell));
+                        spellUsed = true;
+                        break;
+                    }
+                }
+                if (!spellUsed)
+                    delete spell;
+            }
+        }
+
+        //found units to cast on to
+        if (!targetSpellStore.empty())
+        {
+            uint32 index = urand(0, targetSpellStore.size() - 1);
+
+            Spell* spell  = targetSpellStore[index].second;
+            Unit*  target = targetSpellStore[index].first;
+
+            targetSpellStore.erase(targetSpellStore.begin() + index);
+
+            SpellCastTargets targets;
+            targets.setUnitTarget(target);
+
+            if (!me->HasInArc(M_PI, target))
+            {
+                me->SetInFront(target);
+                if (target && target->GetTypeId() == TYPEID_PLAYER)
+          me->SendUpdateToPlayer(target->ToPlayer());
+
+                if (owner && owner->GetTypeId() == TYPEID_PLAYER)
+          me->SendUpdateToPlayer(owner->ToPlayer());
+            }
+
+            me->AddCreatureSpellCooldown(spell->m_spellInfo->Id);
+
+            spell->prepare(&targets);
+        }
+
+        // deleted cached Spell objects
+        for (TargetSpellList::const_iterator itr = targetSpellStore.begin(); itr != targetSpellStore.end(); ++itr)
+            delete itr->second;
+    }
+}
+
+void PetAI::UpdateAllies()
+{
+    Unit* owner = me->GetCharmerOrOwner();
+    Group *pGroup = NULL;
+
+    m_updateAlliesTimer = 10*IN_MILISECONDS;                //update friendly targets every 10 seconds, lesser checks increase performance
+
+    if (!owner)
+        return;
+    else if (owner->GetTypeId() == TYPEID_PLAYER)
+        pGroup = owner->ToPlayer()->GetGroup();
+
+    //only pet and owner/not in group->ok
+    if (m_AllySet.size() == 2 && !pGroup)
+        return;
+    //owner is in group; group members filled in already (no raid -> subgroupcount = whole count)
+    if (pGroup && !pGroup->isRaidGroup() && m_AllySet.size() == (pGroup->GetMembersCount() + 2))
+        return;
+
+    m_AllySet.clear();
+    m_AllySet.insert(me->GetGUID());
+    if (pGroup)                                              //add group
+    {
+        for (GroupReference *itr = pGroup->GetFirstMember(); itr != NULL; itr = itr->next())
+        {
+            Player* Target = itr->getSource();
+            if (!Target || !pGroup->SameSubGroup((Player*)owner, Target))
+                continue;
+
+            if (Target->GetGUID() == owner->GetGUID())
+                continue;
+
+            m_AllySet.insert(Target->GetGUID());
+        }
+    }
+    else                                                    //remove group
+        m_AllySet.insert(owner->GetGUID());
+}
+
+void PetAI::KilledUnit(Unit *victim)
+{
+    // Called from Unit::Kill() in case where pet or owner kills something
+    // if owner killed this victim, pet may still be attacking something else
+    if (me->getVictim() && me->getVictim() != victim)
+        return;
+
+    // Clear target just in case. May help problem where health / focus / mana
+    // regen gets stuck. Also resets attack command.
+    // Can't use _stopAttack() because that activates movement handlers and ignores
+    // next target selection
+    me->AttackStop();
+    me->GetCharmInfo()->SetIsCommandAttack(false);
+
+    Unit *nextTarget = SelectNextTarget();
+
+    if (nextTarget)
+        AttackStart(nextTarget);
+    else
+        HandleReturnMovement(); // Return
+}
+
+void PetAI::AttackStart(Unit *target)
+{
+    // Overrides Unit::AttackStart to correctly evaluate Pet states
+
+    // Check all pet states to decide if we can attack this target
+    if (!_CanAttack(target))
+        return;
+
+    // We can attack, should we chase or not?
+    if (me->GetCharmInfo()->HasCommandState(COMMAND_FOLLOW))
+        DoAttack(target,true); // FOLLOW, attack with chase
+    else
+    {
+        if (me->GetCharmInfo()->IsCommandAttack())
+            DoAttack(target,true); // STAY or FOLLOW, player clicked "attack" so attack with chase
+        else
+            DoAttack(target,false); // STAY, target in range, attack not clicked so attack without chase
+    }
+}
+
+Unit *PetAI::SelectNextTarget()
+{
+    // Provides next target selection after current target death
+
+    // Passive pets don't do next target selection
+    if (me->HasReactState(REACT_PASSIVE))
+        return NULL;
+
+    // Check pet's attackers first to prevent dragging mobs back
+    // to owner
+    if (me->getAttackerForHelper())
+        return me->getAttackerForHelper();
+
+    // Check owner's attackers if pet didn't have any
+    if (me->GetCharmerOrOwner()->getAttackerForHelper())
+        return me->GetCharmerOrOwner()->getAttackerForHelper();
+
+    // 3.0.2 - Pets now start attacking their owners target in defensive mode as soon as the hunter does
+    if (me->GetCharmerOrOwner()->getVictim())
+        return me->GetCharmerOrOwner()->getVictim();
+
+    // Default
+    return NULL;
+}
+
+void PetAI::HandleReturnMovement()
+{
+    // Handles moving the pet back to stay or owner
+
+    if (me->GetCharmInfo()->HasCommandState(COMMAND_STAY))
+    {
+        if (!me->GetCharmInfo()->IsAtStay() && !me->GetCharmInfo()->IsReturning())
+        {
+            // Return to previous position where stay was clicked
+            if (!me->GetCharmInfo()->IsCommandAttack())
+            {
+                float x,y,z;
+
+                me->GetCharmInfo()->GetStayPosition(x, y, z);
+                me->GetCharmInfo()->SetIsReturning(true);
+                me->GetMotionMaster()->Clear();
+                me->GetMotionMaster()->MovePoint(me->GetGUIDLow(),x,y,z);
+            }
+        }
+    }
+    else // COMMAND_FOLLOW
+    {
+        if (!me->GetCharmInfo()->IsFollowing() && !me->GetCharmInfo()->IsReturning())
+        {
+            if (!me->GetCharmInfo()->IsCommandAttack())
+            {
+                me->GetCharmInfo()->SetIsReturning(true);
+                me->GetMotionMaster()->Clear();
+                me->GetMotionMaster()->MoveFollow(me->GetCharmerOrOwner(), PET_FOLLOW_DIST, me->GetFollowAngle());
+            }
+        }
+    }
+
+}
+
+void PetAI::DoAttack(Unit *target, bool chase)
+{
+    // Handles attack with or without chase and also resets all
+    // PetAI flags for next update / creature kill
+
+    // me->GetCharmInfo()->SetIsCommandAttack(false);
+
+    // The following conditions are true if chase == true
+    // (Follow && (Aggressive || Defensive))
+    // ((Stay || Follow) && (Passive && player clicked attack))
+
+    if (chase)
+    {
+        if (me->Attack(target,true))
+        {
+            me->GetCharmInfo()->SetIsAtStay(false);
+            me->GetCharmInfo()->SetIsFollowing(false);
+            me->GetCharmInfo()->SetIsReturning(false);
+            me->GetMotionMaster()->Clear();
+            me->GetMotionMaster()->MoveChase(target);
+        }
+    }
+    else // (Stay && ((Aggressive || Defensive) && In Melee Range)))
+    {
+        me->GetCharmInfo()->SetIsAtStay(true);
+        me->GetCharmInfo()->SetIsFollowing(false);
+        me->GetCharmInfo()->SetIsReturning(false);
+        me->Attack(target,true);
+    }
+}
+
+void PetAI::MovementInform(uint32 moveType, uint32 data)
+{
+    // Receives notification when pet reaches stay or follow owner
+    switch (moveType)
+    {
+        case POINT_MOTION_TYPE:
+        {
+            // Pet is returning to where stay was clicked. data should be
+            // pet's GUIDLow since we set that as the waypoint ID
+            if (data == me->GetGUIDLow() && me->GetCharmInfo()->IsReturning())
+            {
+                me->GetCharmInfo()->SetIsAtStay(true);
+                me->GetCharmInfo()->SetIsReturning(false);
+                me->GetCharmInfo()->SetIsFollowing(false);
+                me->GetCharmInfo()->SetIsCommandAttack(false);
+                me->GetMotionMaster()->Clear();
+                me->GetMotionMaster()->MoveIdle();
+            }
+        }
+        break;
+
+        case TARGETED_MOTION_TYPE:
+        {
+            // If data is owner's GUIDLow then we've reached follow point,
+            // otherwise we're probably chasing a creature
+            if (me->GetCharmerOrOwner() && me->GetCharmInfo() && data == me->GetCharmerOrOwner()->GetGUIDLow() && me->GetCharmInfo()->IsReturning())
+            {
+                me->GetCharmInfo()->SetIsAtStay(false);
+                me->GetCharmInfo()->SetIsReturning(false);
+                me->GetCharmInfo()->SetIsFollowing(true);
+                me->GetCharmInfo()->SetIsCommandAttack(false);
+                me->addUnitState(UNIT_STAT_FOLLOW);
+            }
+        }
+        break;
+
+        default:
+            break;
+    }
+}
+
+bool PetAI::_CanAttack(Unit *target)
+{
+    // Evaluates wether a pet can attack a specific
+    // target based on CommandState, ReactState and other flags
+
+    // Returning - check first since pets returning ignore attacks
+    if (me->GetCharmInfo()->IsReturning())
+        return false;
+
+    // Passive - check now so we don't have to worry about passive in later checks
+    if (me->HasReactState(REACT_PASSIVE))
+        return me->GetCharmInfo()->IsCommandAttack();
+
+    //  Pets commanded to attack should not stop their approach if attacked by another creature
+    if (me->getVictim() && (me->getVictim() != target))
+        return !me->GetCharmInfo()->IsCommandAttack();
+
+    // From this point on, pet will always be either aggressive or defensive
+
+    // Stay - can attack if target is within range or commanded to
+    if (me->GetCharmInfo()->HasCommandState(COMMAND_STAY))
+        return (me->IsWithinMeleeRange(target, MIN_MELEE_REACH) || me->GetCharmInfo()->IsCommandAttack());
+
+    // Follow
+    if (me->GetCharmInfo()->HasCommandState(COMMAND_FOLLOW))
+        return true;
+
+    // default, though we shouldn't ever get here
+    return false;
+}