themaster1970sf/TShock
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

4.2.7 Code Freeze

Browse source 
Merge branch 'general-devel'
This commit is contained in:
Lucas Nicodemus 2015-03-08 21:31:30 -06:00
commit 5dfb1a806c
4 changed files with 71 additions and 83 deletions
Download patch file Download diff file Expand all files Collapse all files

3
README.md
View file

@ -1,4 +1,4 @@
# TShock [![Build Status](https://travis-ci.org/NyxStudios/TShock.png?branch=general-devel)](https://travis-ci.org/NyxStudios/TShock) # TShock [![Build Status](https://travis-ci.org/NyxStudios/TShock.png?branch=general-devel)](https://travis-ci.org/NyxStudios/TShock)
TShock is a server modification for Terraria, written in C#, and based upon the [Terraria Server API](https://github.com/Deathmax/TerrariaAPI-Server). It uses JSON for configuration management, and offers several features not present in the Terraria Server normally. TShock is a server modification for Terraria, written in C#, and based upon the [Terraria Server API](https://github.com/Deathmax/TerrariaAPI-Server). It uses JSON for configuration management, and offers several features not present in the Terraria Server normally.
@ -18,6 +18,7 @@ Feeling like helping out? Want to find an awesome server? Some awesome plugins?
* [Website & Forums](https://tshock.co/xf/) * [Website & Forums](https://tshock.co/xf/)
* [Wiki](https://tshock.atlassian.net/wiki/display/TSHOCKPLUGINS/Home) * [Wiki](https://tshock.atlassian.net/wiki/display/TSHOCKPLUGINS/Home)
* [Join our chat (supports IRC, XMPP, iOS, Android, Web)](http://chat.tshock.co/)
## Download ## Download

2
TShockAPI/Commands.cs
View file

@ -623,7 +623,7 @@ namespace TShockAPI
IEnumerable<Command> cmds = ChatCommands.FindAll(c => c.HasAlias(cmdName)); IEnumerable<Command> cmds = ChatCommands.FindAll(c => c.HasAlias(cmdName));
if (Hooks.PlayerHooks.OnPlayerCommand(player, cmdName, cmdText, args, ref cmds)) if (Hooks.PlayerHooks.OnPlayerCommand(player, cmdName, cmdText, args, ref cmds, cmdPrefix))
return true; return true;
if (cmds.Count() == 0) if (cmds.Count() == 0)

131
TShockAPI/Hooks/PlayerHooks.cs
View file

@ -21,30 +21,31 @@ using System.ComponentModel;
namespace TShockAPI.Hooks namespace TShockAPI.Hooks
{ {
public class PlayerPostLoginEventArgs public class PlayerPostLoginEventArgs
{ {
public TSPlayer Player { get; set; } public TSPlayer Player { get; set; }
public PlayerPostLoginEventArgs(TSPlayer ply) public PlayerPostLoginEventArgs(TSPlayer ply)
{ {
Player = ply; Player = ply;
} }
} }
public class PlayerPreLoginEventArgs : HandledEventArgs public class PlayerPreLoginEventArgs : HandledEventArgs
{ {
public TSPlayer Player { get; set; } public TSPlayer Player { get; set; }
public string LoginName { get; set; } public string LoginName { get; set; }
public string Password { get; set; } public string Password { get; set; }
} }
public class PlayerCommandEventArgs : HandledEventArgs public class PlayerCommandEventArgs : HandledEventArgs
{ {
public TSPlayer Player { get; set; } public TSPlayer Player { get; set; }
public string CommandName { get; set; } public string CommandName { get; set; }
public string CommandText { get; set; } public string CommandText { get; set; }
public List<string> Parameters { get; set; } public List<string> Parameters { get; set; }
public IEnumerable<Command> CommandList { get; set; } public IEnumerable<Command> CommandList { get; set; }
} public string CommandPrefix { get; set; }
}
public class PlayerChatEventArgs : HandledEventArgs public class PlayerChatEventArgs : HandledEventArgs
{ {
@ -53,59 +54,59 @@ namespace TShockAPI.Hooks
public string TShockFormattedText { get; set; } public string TShockFormattedText { get; set; }
} }
public static class PlayerHooks public static class PlayerHooks
{ {
public delegate void PlayerPostLoginD(PlayerPostLoginEventArgs e); public delegate void PlayerPostLoginD(PlayerPostLoginEventArgs e);
public static event PlayerPostLoginD PlayerPostLogin; public static event PlayerPostLoginD PlayerPostLogin;
public delegate void PlayerPreLoginD(PlayerPreLoginEventArgs e); public delegate void PlayerPreLoginD(PlayerPreLoginEventArgs e);
public static event PlayerPreLoginD PlayerPreLogin; public static event PlayerPreLoginD PlayerPreLogin;
public delegate void PlayerCommandD(PlayerCommandEventArgs e); public delegate void PlayerCommandD(PlayerCommandEventArgs e);
public static event PlayerCommandD PlayerCommand; public static event PlayerCommandD PlayerCommand;
public delegate void PlayerChatD(PlayerChatEventArgs e); public delegate void PlayerChatD(PlayerChatEventArgs e);
public static event PlayerChatD PlayerChat; public static event PlayerChatD PlayerChat;
public static void OnPlayerPostLogin(TSPlayer ply) public static void OnPlayerPostLogin(TSPlayer ply)
{ {
if (PlayerPostLogin == null) if (PlayerPostLogin == null)
{ {
return; return;
} }
PlayerPostLoginEventArgs args = new PlayerPostLoginEventArgs(ply); PlayerPostLoginEventArgs args = new PlayerPostLoginEventArgs(ply);
PlayerPostLogin(args); PlayerPostLogin(args);
} }
public static bool OnPlayerCommand(TSPlayer player, string cmdName, string cmdText, List<string> args, ref IEnumerable<Command> commands) public static bool OnPlayerCommand(TSPlayer player, string cmdName, string cmdText, List<string> args, ref IEnumerable<Command> commands, string cmdPrefix)
{ {
if (PlayerCommand == null) if (PlayerCommand == null)
{ {
return false; return false;
} }
PlayerCommandEventArgs playerCommandEventArgs = new PlayerCommandEventArgs() PlayerCommandEventArgs playerCommandEventArgs = new PlayerCommandEventArgs()
{ {
Player = player, Player = player,
CommandName = cmdName, CommandName = cmdName,
CommandText = cmdText, CommandText = cmdText,
Parameters = args, Parameters = args,
CommandList = commands CommandList = commands,
}; CommandPrefix = cmdPrefix,
PlayerCommand(playerCommandEventArgs); };
commands = playerCommandEventArgs.CommandList; PlayerCommand(playerCommandEventArgs);
return playerCommandEventArgs.Handled; return playerCommandEventArgs.Handled;
} }
public static bool OnPlayerPreLogin(TSPlayer ply, string name, string pass) public static bool OnPlayerPreLogin(TSPlayer ply, string name, string pass)
{ {
if (PlayerPreLogin == null) if (PlayerPreLogin == null)
return false; return false;
var args = new PlayerPreLoginEventArgs {Player = ply, LoginName = name, Password = pass}; var args = new PlayerPreLoginEventArgs {Player = ply, LoginName = name, Password = pass};
PlayerPreLogin(args); PlayerPreLogin(args);
return args.Handled; return args.Handled;
} }
public static void OnPlayerChat(TSPlayer ply, string rawtext, ref string tshockText) public static void OnPlayerChat(TSPlayer ply, string rawtext, ref string tshockText)
{ {
@ -116,5 +117,5 @@ namespace TShockAPI.Hooks
PlayerChat(args); PlayerChat(args);
tshockText = args.TShockFormattedText; tshockText = args.TShockFormattedText;
} }
} }
} }

18
TShockAPI/TShock.cs
View file

@ -1132,26 +1132,12 @@ namespace TShockAPI
WorldGen.genRand = new Random(); WorldGen.genRand = new Random();
} }
if (args.Command.StartsWith("playing") || args.Command.StartsWith("{0}playing".SFormat(Commands.Specifier))) if (args.Command == "autosave")
{
int count = 0;
foreach (TSPlayer player in Players)
{
if (player != null && player.Active)
{
count++;
TSPlayer.Server.SendInfoMessage("{0} ({1}) [{2}] <{3}>", player.Name, player.IP,
player.Group.Name, player.UserAccountName);
}
}
TSPlayer.Server.SendInfoMessage("{0} players connected.", count);
}
else if (args.Command == "autosave")
{ {
Main.autoSave = Config.AutoSave = !Config.AutoSave; Main.autoSave = Config.AutoSave = !Config.AutoSave;
Log.ConsoleInfo("AutoSave " + (Config.AutoSave ? "Enabled" : "Disabled")); Log.ConsoleInfo("AutoSave " + (Config.AutoSave ? "Enabled" : "Disabled"));
} }
else if (args.Command.StartsWith(Commands.Specifier)) else if (args.Command.StartsWith(Commands.Specifier) || args.Command.StartsWith(Commands.SilentSpecifier))
{ {
Commands.HandleCommand(TSPlayer.Server, args.Command); Commands.HandleCommand(TSPlayer.Server, args.Command);
} }