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

Conflicts:
	src/server/game/DataStores/DBCEnums.h
	src/server/scripts/Commands/cs_wp.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp

1 files changed, 4 insertions, 7 deletions

diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp
index 53e09c918ea..8dd009cdb32 100644
--- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp
+++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp
@@ -308,18 +308,15 @@ public:
             {
                 if (instance)
                 {
-                    Unit* pKri = Unit::GetUnit(*me, instance->GetData64(DATA_KRI));
-                    Unit* pVem = Unit::GetUnit(*me, instance->GetData64(DATA_VEM));
-
                     switch (urand(0, 2))
                     {
                         case 0:
-                            if (pKri)
-                                DoCast(pKri, SPELL_HEAL);
+                            if (Creature* kri = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_KRI)))
+                                DoCast(kri, SPELL_HEAL);
                             break;
                         case 1:
-                            if (pVem)
-                                DoCast(pVem, SPELL_HEAL);
+                            if (Creature* vem = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_VEM)))
+                                DoCast(vem, SPELL_HEAL);
                             break;
                         case 2:
                             DoCast(me, SPELL_HEAL);