1 files changed, 12 insertions, 9 deletions
diff --git a/src/server/game/Instances/InstanceScript.cpp b/src/server/game/Instances/InstanceScript.cpp
index d0a96e3b62e..2a0f62d8de2 100755
--- a/src/server/game/Instances/InstanceScript.cpp
+++ b/src/server/game/Instances/InstanceScript.cpp
@@ -397,22 +397,25 @@ void InstanceScript::SendEncounterUnit(uint32 type, Unit* unit /*= NULL*/, uint8
 
     switch (type)
     {
-        case ENCOUNTER_FRAME_ADD:
-        case ENCOUNTER_FRAME_REMOVE:
-        case 2:
+        case ENCOUNTER_FRAME_ENGAGE:
+        case ENCOUNTER_FRAME_DISENGAGE:
+        case ENCOUNTER_FRAME_UPDATE_PRIORITY:
+            if (!unit)
+                return;
             data.append(unit->GetPackGUID());
             data << uint8(param1);
             break;
-        case 3:
-        case 4:
-        case 6:
+        case ENCOUNTER_FRAME_ADD_TIMER:
+        case ENCOUNTER_FRAME_ENABLE_OBJECTIVE:
+        case ENCOUNTER_FRAME_DISABLE_OBJECTIVE:
+        case ENCOUNTER_FRAME_COMBAT_RES_LIMIT:
             data << uint8(param1);
-            data << uint8(param2);
             break;
-        case 5:
+        case ENCOUNTER_FRAME_UPDATE_OBJECTIVE:
             data << uint8(param1);
+            data << uint8(param2);
             break;
-        case 7:
+        case ENCOUNTER_FRAME_UNK7:
         default:
             break;
     }