Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts: src/server/game/Entities/Unit/Unit.cpp src/server/game/Handlers/BattleGroundHandler.cpp src/server/game/Instances/InstanceScript.cpp src/server/game/Server/Protocol/Opcodes.cpp src/server/game/Server/WorldSession.h src/server/scripts/Spells/spell_priest.cpp src/server/scripts/Spells/spell_rogue.cpp
This commit is contained in:
commit
66e8d8c69e
48 files changed
+10028
-1669
No files matched your search
@@ -421,7 +421,7 @@ enum SMART_ACTION
|
||||
SMART_ACTION_UPDATE_TEMPLATE = 36, // Entry, Team
|
||||
SMART_ACTION_DIE = 37, // No Params
|
||||
SMART_ACTION_SET_IN_COMBAT_WITH_ZONE = 38, // No Params
|
||||
SMART_ACTION_CALL_FOR_HELP = 39, // Radius
|
||||
SMART_ACTION_CALL_FOR_HELP = 39, // Radius, With Emote
|
||||
SMART_ACTION_SET_SHEATH = 40, // Sheath (0-unarmed, 1-melee, 2-ranged)
|
||||
SMART_ACTION_FORCE_DESPAWN = 41, // timer
|
||||
SMART_ACTION_SET_INVINCIBILITY_HP_LEVEL = 42, // MinHpValue(+pct, -flat)
|
||||
@@ -678,6 +678,7 @@ struct SmartAction
|
||||
struct
|
||||
{
|
||||
uint32 range;
|
||||
uint32 withEmote;
|
||||
} callHelp;
|
||||
|
||||
struct
|
||||
|
||||
Reference in new issue
Block a user