diff options
Diffstat (limited to 'src')
| -rwxr-xr-x | src/server/game/Entities/Unit/Unit.h | 2 | ||||
| -rwxr-xr-x | src/server/game/Server/Protocol/Opcodes.cpp | 8 | ||||
| -rwxr-xr-x | src/server/game/Server/Protocol/Opcodes.h | 8 | ||||
| -rwxr-xr-x | src/server/game/Spells/Spell.cpp | 4 | ||||
| -rw-r--r-- | src/server/scripts/Northrend/Ulduar/ulduar/boss_xt002.cpp | 4 |
5 files changed, 13 insertions, 13 deletions
diff --git a/src/server/game/Entities/Unit/Unit.h b/src/server/game/Entities/Unit/Unit.h index 815892ed3b0..cb4bd39347b 100755 --- a/src/server/game/Entities/Unit/Unit.h +++ b/src/server/game/Entities/Unit/Unit.h @@ -572,7 +572,7 @@ enum DamageEffectType // Value masks for UNIT_FIELD_FLAGS enum UnitFlags { - UNIT_FLAG_UNK_0 = 0x00000001, + UNIT_FLAG_SERVER_CONTROLLED = 0x00000001, // set only when unit movement is controlled by server - by SPLINE/MONSTER_MOVE packets, together with UNIT_FLAG_STUNNED; only set to units controlled by client; client function CGUnit_C::IsClientControlled returns false when set for owner UNIT_FLAG_NON_ATTACKABLE = 0x00000002, // not attackable UNIT_FLAG_DISABLE_MOVE = 0x00000004, UNIT_FLAG_PVP_ATTACKABLE = 0x00000008, // allow apply pvp rules to attackable state in addition to faction dependent state diff --git a/src/server/game/Server/Protocol/Opcodes.cpp b/src/server/game/Server/Protocol/Opcodes.cpp index 629df10abf7..cbaf789faf6 100755 --- a/src/server/game/Server/Protocol/Opcodes.cpp +++ b/src/server/game/Server/Protocol/Opcodes.cpp @@ -1256,10 +1256,10 @@ OpcodeHandler opcodeTable[NUM_MSG_TYPES] = /*0x4CB*/ { "CMSG_START_BATTLEFIELD_CHEAT", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_NULL }, /*0x4CC*/ { "CMSG_END_BATTLEFIELD_CHEAT", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_NULL }, /*0x4CD*/ { "SMSG_MULTIPLE_PACKETS", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide }, - /*0x4CE*/ { "SMSG_FORCE_UNK1_SPEED_CHANGE", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide }, - /*0x4CF*/ { "CMSG_FORCE_UNK1_SPEED_CHANGE_ACK", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_NULL }, - /*0x4D0*/ { "SMSG_FORCE_UNK2_SPEED_CHANGE", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide }, - /*0x4D1*/ { "CMSG_FORCE_UNK2_SPEED_CHANGE_ACK", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_NULL }, + /*0x4CE*/ { "SMSG_MOVE_GRAVITY_DISABLE", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide }, + /*0x4CF*/ { "CMSG_MOVE_GRAVITY_DISABLE_ACK", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_NULL }, + /*0x4D0*/ { "SMSG_MOVE_GRAVITY_ENABLE", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide }, + /*0x4D1*/ { "CMSG_MOVE_GRAVITY_ENABLE_ACK", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_NULL }, /*0x4D2*/ { "MSG_MOVE_GRAVITY_CHNG", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide }, /*0x4D3*/ { "SMSG_SPLINE_MOVE_GRAVITY_DISABLE", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide }, /*0x4D4*/ { "SMSG_SPLINE_MOVE_GRAVITY_ENABLE", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide }, diff --git a/src/server/game/Server/Protocol/Opcodes.h b/src/server/game/Server/Protocol/Opcodes.h index 5f88aa3c01f..c02b52bfb5a 100755 --- a/src/server/game/Server/Protocol/Opcodes.h +++ b/src/server/game/Server/Protocol/Opcodes.h @@ -1264,10 +1264,10 @@ enum Opcodes CMSG_START_BATTLEFIELD_CHEAT = 0x4CB, CMSG_END_BATTLEFIELD_CHEAT = 0x4CC, SMSG_MULTIPLE_PACKETS = 0x4CD, - SMSG_FORCE_UNK1_SPEED_CHANGE = 0x4CE, - CMSG_FORCE_UNK1_SPEED_CHANGE_ACK = 0x4CF, - SMSG_FORCE_UNK2_SPEED_CHANGE = 0x4D0, - CMSG_FORCE_UNK2_SPEED_CHANGE_ACK = 0x4D1, + SMSG_MOVE_GRAVITY_DISABLE = 0x4CE, + CMSG_MOVE_GRAVITY_DISABLE_ACK = 0x4CF, + SMSG_MOVE_GRAVITY_ENABLE = 0x4D0, + CMSG_MOVE_GRAVITY_ENABLE_ACK = 0x4D1, MSG_MOVE_GRAVITY_CHNG = 0x4D2, SMSG_SPLINE_MOVE_GRAVITY_DISABLE = 0x4D3, SMSG_SPLINE_MOVE_GRAVITY_ENABLE = 0x4D4, diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp index d005f5b2404..198e1b7b43f 100755 --- a/src/server/game/Spells/Spell.cpp +++ b/src/server/game/Spells/Spell.cpp @@ -3101,8 +3101,8 @@ void Spell::cast(bool skipCheck) m_caster->ToPlayer()->SetSpellModTakingSpell(this, true); } - // triggered cast called from Spell::prepare where it was already checked - if (!IsTriggered() || !skipCheck) + // skip check if done already (for instant cast spells for example) + if (!skipCheck) { SpellCastResult castResult = CheckCast(false); if (castResult != SPELL_CAST_OK) diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_xt002.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_xt002.cpp index 26b200bdbbc..3c8b62bf64a 100644 --- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_xt002.cpp +++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_xt002.cpp @@ -978,7 +978,7 @@ class spell_xt002_submerged : public SpellScriptLoader if (!caster) return; - caster->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_UNK_0 | UNIT_FLAG_NOT_SELECTABLE); + caster->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); caster->SetByteValue(UNIT_FIELD_BYTES_1, 0, UNIT_STAND_STATE_SUBMERGED); } @@ -1009,7 +1009,7 @@ class spell_xt002_stand : public SpellScriptLoader if (!target) return; - target->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_UNK_0 | UNIT_FLAG_NOT_SELECTABLE); + target->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); target->SetByteValue(UNIT_FIELD_BYTES_1, 0, UNIT_STAND_STATE_STAND); } |