diff options
Diffstat (limited to 'src/server/game/Instances/InstanceScript.cpp')
| -rw-r--r-- | src/server/game/Instances/InstanceScript.cpp | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/src/server/game/Instances/InstanceScript.cpp b/src/server/game/Instances/InstanceScript.cpp index 280d95f6f76..c151183da8a 100644 --- a/src/server/game/Instances/InstanceScript.cpp +++ b/src/server/game/Instances/InstanceScript.cpp @@ -560,32 +560,28 @@ bool InstanceScript::CheckAchievementCriteriaMeet(uint32 criteria_id, Player con void InstanceScript::SendEncounterUnit(uint32 type, Unit* unit /*= NULL*/, uint8 param1 /*= 0*/, uint8 param2 /*= 0*/) { // size of this packet is at most 15 (usually less) - WorldPacket data(SMSG_UPDATE_INSTANCE_ENCOUNTER_UNIT, 15); + WorldPacket data(SMSG_INSTANCE_ENCOUNTER_ENGAGE_UNIT, 15); data << uint32(type); switch (type) { - case ENCOUNTER_FRAME_ENGAGE: - case ENCOUNTER_FRAME_DISENGAGE: - case ENCOUNTER_FRAME_UPDATE_PRIORITY: + case ENCOUNTER_FRAME_ENGAGE: // SMSG_INSTANCE_ENCOUNTER_ENGAGE_UNIT + case ENCOUNTER_FRAME_DISENGAGE: // SMSG_INSTANCE_ENCOUNTER_DISENGAGE_UNIT + case ENCOUNTER_FRAME_UPDATE_PRIORITY: // SMSG_INSTANCE_ENCOUNTER_CHANGE_PRIORITY if (!unit) return; data << unit->GetPackGUID(); data << uint8(param1); break; - case ENCOUNTER_FRAME_ADD_TIMER: - case ENCOUNTER_FRAME_ENABLE_OBJECTIVE: - case ENCOUNTER_FRAME_DISABLE_OBJECTIVE: - case ENCOUNTER_FRAME_SET_COMBAT_RES_LIMIT: + case ENCOUNTER_FRAME_ADD_TIMER: // SMSG_INSTANCE_ENCOUNTER_TIMER_START + case ENCOUNTER_FRAME_ENABLE_OBJECTIVE: // SMSG_INSTANCE_ENCOUNTER_OBJECTIVE_START + case ENCOUNTER_FRAME_DISABLE_OBJECTIVE: // SMSG_INSTANCE_ENCOUNTER_OBJECTIVE_COMPLETE data << uint8(param1); break; - case ENCOUNTER_FRAME_UPDATE_OBJECTIVE: + case ENCOUNTER_FRAME_UPDATE_OBJECTIVE: // SMSG_INSTANCE_ENCOUNTER_OBJECTIVE_UPDATE data << uint8(param1); data << uint8(param2); break; - case ENCOUNTER_FRAME_UNK7: - case ENCOUNTER_FRAME_ADD_COMBAT_RES_LIMIT: - case ENCOUNTER_FRAME_RESET_COMBAT_RES_LIMIT: default: break; } |