Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4

Conflicts:
	src/server/game/Movement/MovementGenerators/IdleMovementGenerator.cpp
	src/server/scripts/EasternKingdoms/BlackrockSpire/boss_rend_blackhand.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp
	src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp
	src/server/scripts/EasternKingdoms/zone_arathi_highlands.cpp
	src/server/scripts/Kalimdor/zone_azshara.cpp
	src/server/scripts/Kalimdor/zone_dustwallow_marsh.cpp
	src/server/scripts/Kalimdor/zone_silithus.cpp
	src/server/scripts/Kalimdor/zone_tanaris.cpp
	src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp
	src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp
	src/server/scripts/Spells/spell_item.cpp

1 files changed, 6 insertions, 6 deletions

diff --git a/src/server/scripts/World/npcs_special.cpp b/src/server/scripts/World/npcs_special.cpp
index 1034402c7b7..dca55306113 100644
--- a/src/server/scripts/World/npcs_special.cpp
+++ b/src/server/scripts/World/npcs_special.cpp
@@ -1709,14 +1709,14 @@ public:
 #define SAY_RANDOM_MOJO6b   ", I know of a little swamp not too far from here...."
 #define SAY_RANDOM_MOJO7    "There's just never enough Mojo to go around..."
 
-class mob_mojo : public CreatureScript
+class npc_mojo : public CreatureScript
 {
 public:
-    mob_mojo() : CreatureScript("mob_mojo") { }
+    npc_mojo() : CreatureScript("npc_mojo") { }
 
-    struct mob_mojoAI : public ScriptedAI
+    struct npc_mojoAI : public ScriptedAI
     {
-        mob_mojoAI(Creature* creature) : ScriptedAI(creature) {Reset();}
+        npc_mojoAI(Creature* creature) : ScriptedAI(creature) {Reset();}
         uint32 hearts;
         uint64 victimGUID;
         void Reset()
@@ -1796,7 +1796,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const
     {
-        return new mob_mojoAI(creature);
+        return new npc_mojoAI(creature);
     }
 };
 
@@ -2967,7 +2967,7 @@ void AddSC_npcs_special()
     new npc_mirror_image();
     new npc_ebon_gargoyle();
     new npc_lightwell();
-    new mob_mojo();
+    new npc_mojo();
     new npc_training_dummy();
     new npc_shadowfiend();
     new npc_wormhole();