diff --git a/src/game/Opcodes.cpp b/src/game/Opcodes.cpp index cb3837d39..2d168b958 100644 --- a/src/game/Opcodes.cpp +++ b/src/game/Opcodes.cpp @@ -392,7 +392,7 @@ void InitializeOpcodes() OPCODE(CMSG_CANCEL_CHANNELLING, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleCancelChanneling ); OPCODE(SMSG_AI_REACTION, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide ); OPCODE(CMSG_SET_SELECTION, STATUS_LOGGEDIN, PROCESS_INPLACE, &WorldSession::HandleSetSelectionOpcode ); - OPCODE(CMSG_DELETEEQUIPMENT_SET, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleEquipmentSetDeleteOpcode ); + OPCODE(CMSG_EQUIPMENT_SET_DELETE, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleEquipmentSetDeleteOpcode ); //OPCODE(CMSG_INSTANCE_LOCK_RESPONSE, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_NULL ); //OPCODE(CMSG_DEBUG_PASSIVE_AURA, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_NULL ); OPCODE(CMSG_ATTACKSWING, STATUS_LOGGEDIN, PROCESS_INPLACE, &WorldSession::HandleAttackSwingOpcode ); diff --git a/src/game/Opcodes.h b/src/game/Opcodes.h index 9bb0184e2..6b479abf4 100644 --- a/src/game/Opcodes.h +++ b/src/game/Opcodes.h @@ -376,7 +376,7 @@ enum Opcodes CMSG_CANCEL_CHANNELLING = 0x6C25, // 4.3.4 15595 SMSG_AI_REACTION = 0x0637, // 4.3.4 15595 CMSG_SET_SELECTION = 0x0506, // 4.3.4 15595 - CMSG_DELETEEQUIPMENT_SET = 0x4D07, // 4.3.4 15595 + CMSG_EQUIPMENT_SET_DELETE = 0x4D07, // 4.3.4 15595 CMSG_INSTANCE_LOCK_RESPONSE = 0x1140, CMSG_DEBUG_PASSIVE_AURA = 0x1141, CMSG_ATTACKSWING = 0x0926, // 4.3.4 15595 diff --git a/src/game/Player.cpp b/src/game/Player.cpp index 568de437c..e62fc0861 100644 --- a/src/game/Player.cpp +++ b/src/game/Player.cpp @@ -4595,13 +4595,12 @@ void Player::ResurrectPlayer(float restore_percent, bool applySickness) // remove death flag + set aura SetByteValue(UNIT_FIELD_BYTES_1, 3, 0x00); - - SetDeathState(ALIVE); - if (getRace() == RACE_NIGHTELF) RemoveAurasDueToSpell(20584); // speed bonuses RemoveAurasDueToSpell(8326); // SPELL_AURA_GHOST + SetDeathState(ALIVE); + SetWaterWalk(false); SetRoot(false); diff --git a/src/game/SpellAuras.cpp b/src/game/SpellAuras.cpp index ffb44c05d..ff93bf673 100644 --- a/src/game/SpellAuras.cpp +++ b/src/game/SpellAuras.cpp @@ -4018,6 +4018,9 @@ void Aura::HandleAuraTransform(bool apply, bool Real) if (Unit* caster = GetCaster()) if (caster->HasAura(52648)) // Glyph of the Penguin model_id = 26452; + else + if (caster->HasAura(57927)) // Glyph of the Monkey + model_id = 21362; target->SetDisplayId(model_id);