aboutsummaryrefslogtreecommitdiff
path: root/src/server/game
diff options
context:
space:
mode:
authortreeston <treeston.mmoc@gmail.com>2016-01-20 23:43:13 +0100
committerjoschiwald <joschiwald.trinity@gmail.com>2016-09-03 13:46:33 +0200
commita92bfb5505e17cc183ec5aa74b01564d566b7677 (patch)
tree874e21eafc1c7bed13881c9119fa4f9fd155253f /src/server/game
parenta140ba4b7598636e1e90ed0243b58878231e4b3b (diff)
Scripts/Commands: Small QoL adjustments
- .debug hostil now shows spawn ID (DBGUID) in addition to current GUID (so you can .go creature to it) - .npc temp now takes an additional argument before the creature entry that determines whether the spawned creature instantly despawns upon death. Default is instant despawn (current behavior). - Add .npc evade command. - Add .pet level command. - .server shutdown and .server restart now fail with an error message if time is below a config var (GM.ForceShutdownThreshold, default 30s) as long as another player is connected. - New commands .server shutdown force and .server restart force bypass this limitation. (cherry picked from commit 0e1eb460d687e545f95caf0f38a16c3feb7132a3)
Diffstat (limited to 'src/server/game')
-rw-r--r--src/server/game/Accounts/RBAC.h10
-rw-r--r--src/server/game/Miscellaneous/Language.h4
-rw-r--r--src/server/game/World/World.cpp1
-rw-r--r--src/server/game/World/World.h4
4 files changed, 14 insertions, 5 deletions
diff --git a/src/server/game/Accounts/RBAC.h b/src/server/game/Accounts/RBAC.h
index ff1bcfa02f5..32906572f03 100644
--- a/src/server/game/Accounts/RBAC.h
+++ b/src/server/game/Accounts/RBAC.h
@@ -741,9 +741,13 @@ enum RBACPermissions
RBAC_PERM_COMMAND_GO_QUEST = 834,
RBAC_PERM_COMMAND_DEBUG_LOADCELLS = 835,
RBAC_PERM_COMMAND_DEBUG_BOUNDARY = 836,
- RBAC_PERM_COMMAND_RELOAD_CHARACTER_TEMPLATE = 837, // RBAC_PERM_COMMAND_NPC_EVADE on 3.3.5a, someone fix it
- RBAC_PERM_COMMAND_RELOAD_QUEST_GREETING = 838, // RBAC_PERM_COMMAND_RELOAD_QUEST_GREETING on 3.3.5a, someone fix it
- RBAC_PERM_COMMAND_DEBUG_SEND_PLAYSCENE = 839, // RBAC_PERM_COMMAND_DEBUG_SEND_PLAYSCENE on 3.3.5a, someone fix it
+ RBAC_PERM_COMMAND_NPC_EVADE = 837,
+ RBAC_PERM_COMMAND_PET_LEVEL = 838,
+ RBAC_PERM_COMMAND_SERVER_SHUTDOWN_FORCE = 839,
+ RBAC_PERM_COMMAND_SERVER_RESTART_FORCE = 840,
+ RBAC_PERM_COMMAND_RELOAD_CHARACTER_TEMPLATE = 841,
+ RBAC_PERM_COMMAND_RELOAD_QUEST_GREETING = 842,
+ RBAC_PERM_COMMAND_DEBUG_SEND_PLAYSCENE = 843,
// custom permissions 1000+
RBAC_PERM_MAX
diff --git a/src/server/game/Miscellaneous/Language.h b/src/server/game/Miscellaneous/Language.h
index 6f1f4cb2409..8cc13b83a72 100644
--- a/src/server/game/Miscellaneous/Language.h
+++ b/src/server/game/Miscellaneous/Language.h
@@ -1218,6 +1218,8 @@ enum TrinityStrings
LANG_CREATURE_NO_INTERIOR_POINT_FOUND = 11011,
LANG_CREATURE_MOVEMENT_NOT_BOUNDED = 11012,
LANG_CREATURE_MOVEMENT_MAYBE_UNBOUNDED = 11013,
- LANG_INSTANCE_BIND_MISMATCH = 11014
+ LANG_INSTANCE_BIND_MISMATCH = 11014,
+ LANG_CREATURE_NOT_AI_ENABLED = 11015,
+ LANG_SELECT_PLAYER_OR_PET = 11016,
};
#endif
diff --git a/src/server/game/World/World.cpp b/src/server/game/World/World.cpp
index c75022cf8e2..1dff6d2c713 100644
--- a/src/server/game/World/World.cpp
+++ b/src/server/game/World/World.cpp
@@ -1034,6 +1034,7 @@ void World::LoadConfigSettings(bool reload)
}
m_bool_configs[CONFIG_ALLOW_GM_GROUP] = sConfigMgr->GetBoolDefault("GM.AllowInvite", false);
m_bool_configs[CONFIG_GM_LOWER_SECURITY] = sConfigMgr->GetBoolDefault("GM.LowerSecurity", false);
+ m_int_configs[CONFIG_FORCE_SHUTDOWN_THRESHOLD] = sConfigMgr->GetIntDefault("GM.ForceShutdownThreshold", 30);
m_int_configs[CONFIG_GROUP_VISIBILITY] = sConfigMgr->GetIntDefault("Visibility.GroupMode", 1);
diff --git a/src/server/game/World/World.h b/src/server/game/World/World.h
index 37687f0eef0..bf6eec03cff 100644
--- a/src/server/game/World/World.h
+++ b/src/server/game/World/World.h
@@ -65,7 +65,8 @@ enum ServerMessageType
enum ShutdownMask
{
SHUTDOWN_MASK_RESTART = 1,
- SHUTDOWN_MASK_IDLE = 2
+ SHUTDOWN_MASK_IDLE = 2,
+ SHUTDOWN_MASK_FORCE = 4
};
enum ShutdownExitCode
@@ -279,6 +280,7 @@ enum WorldIntConfigs
CONFIG_GM_LEVEL_IN_GM_LIST,
CONFIG_GM_LEVEL_IN_WHO_LIST,
CONFIG_START_GM_LEVEL,
+ CONFIG_FORCE_SHUTDOWN_THRESHOLD,
CONFIG_GROUP_VISIBILITY,
CONFIG_MAIL_DELIVERY_DELAY,
CONFIG_UPTIME_UPDATE,