diff --git a/init/msm b/init/msm index ca75f851..cb4b5156 100755 --- a/init/msm +++ b/init/msm @@ -2414,6 +2414,7 @@ command_help() { echo -e " wl on|off Enables/disables server whitelist checking" echo -e " wl add|remove Add/remove a player to/from a server's whitelist" echo -e " wl list List the players whitelisted for a server" + echo -e " wl reload Reloads a running server's whitelist" echo -e " bl player add|remove Ban/pardon a player from/for a server" echo -e " bl ip add|remove Ban/pardon an IP address from/for a server" echo -e " bl list Lists the banned players and IP address for a server" @@ -2425,6 +2426,7 @@ command_help() { echo -e " time set|add Set/increment time on a server (0-24000)" echo -e " toggledownfall Toggles rain and snow on a server" echo -e " give [amount] [data] Gives an entity to a player" + echo -e " clear [item] [data] Clears a player's inventory" echo -e " xp Gives XP to, or takes away (when negative) XP from, a player" echo -e " save on|off Enable/disable writing world changes to file" echo -e " save all Force the writing of all non-saved world changes to file" @@ -2693,6 +2695,19 @@ command_server_whitelist_list() { fi } +# Reloads the whitelist of players to the live server +# $1: The server ID +command_server_whitelist_reload() { + server_property "$1" WHITELIST_PATH + + if server_is_running "$1"; then + server_command "$1" WHITELIST_RELOAD + echo_fallback "$RETURN" "Whitelist reloaded." + else + error_exit SERVER_STOPPED "Server \"${SERVER_NAME[$1]}\" is not running." + fi +} + # Adds player names to a server's ban list # $1: The server ID # $2->: The player names @@ -2982,6 +2997,20 @@ command_server_give() { fi } +# Clears entity from a player's inventory +# $1: The server ID +# $2: The player name +# $3: The entity id/name +# $4: The entitiy data +command_server_clear() { + if server_is_running "$1"; then + server_command "$1" CLEAR player="$2" item="$3" data="$4" + echo_fallback "$RETURN" "Cleared $3 of $2's inventory." + else + error_exit SERVER_STOPPED "Server \"${SERVER_NAME[$1]}\" is not running." + fi +} + # Gives XP to a player in game # $1: The server ID # $2: The player name @@ -3211,6 +3240,7 @@ register_settings() { register_server_setting CONFIRM_TOGGLEDOWNFALL register_server_setting CONFIRM_GAMEMODE register_server_setting CONFIRM_GIVE + register_server_setting CONFIRM_CLEAR register_server_setting CONFIRM_XP } @@ -3333,7 +3363,7 @@ call_command() { # The "" token must only be placed at the end of a - # commadn signature, and allows an arbitrary amount of + # command signature, and allows an arbitrary amount of # arguments to be passed to the command handler function. "") # Put all remaining user input onto the argument stack @@ -3607,6 +3637,7 @@ register_commands() { register_command " whitelist|wl add " "command_server_whitelist_add" register_command " whitelist|wl remove " "command_server_whitelist_remove" register_command " whitelist|wl list" "command_server_whitelist_list" + register_command " whitelist|wl reload" "command_server_whitelist_reload" register_command " blacklist|bl player add " "command_server_blacklist_player_add" register_command " blacklist|bl player remove " "command_server_blacklist_player_remove" register_command " blacklist|bl ip add " "command_server_blacklist_ip_add" @@ -3624,6 +3655,9 @@ register_commands() { register_command " give " "command_server_give" register_command " give " "command_server_give" register_command " give " "command_server_give" + register_command " clear " "command_server_clear" + register_command " clear " "command_server_clear" + register_command " clear " "command_server_clear" register_command " xp " "command_server_xp" register_command " save on" "command_server_save_on" register_command " save off" "command_server_save_off"