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

Update tshock to API v1.2.0.0

Browse source
This commit is contained in:
high 2011-06-06 16:52:17 -04:00
parent 7980535bdf
commit e9be4eebb0
1 changed files with 33 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

74
TShockAPI/TShock.cs
View file

@ -117,16 +117,16 @@ namespace TShockAPI
Version.Revision + " (" + VersionCodename + ") now running."); Version.Revision + " (" + VersionCodename + ") now running.");
Log.Initialize(FileTools.SaveDir + "log.txt", LogLevel.All, true); Log.Initialize(FileTools.SaveDir + "log.txt", LogLevel.All, true);
Log.Info("Starting..."); Log.Info("Starting...");
GameHooks.OnPreInitialize += OnPreInit; GameHooks.Initialize += OnPreInit;
GameHooks.OnPostInitialize += OnPostInit; GameHooks.PostInitialize += OnPostInit;
GameHooks.OnUpdate += OnUpdate; GameHooks.Update += OnUpdate;
GameHooks.OnLoadContent += OnLoadContent; GameHooks.LoadContent += OnLoadContent;
ServerHooks.OnChat += OnChat; ServerHooks.Chat += OnChat;
ServerHooks.OnJoin += OnJoin; ServerHooks.Join += OnJoin;
NetHooks.OnPreGetData += GetData; NetHooks.GetData += GetData;
NetHooks.OnGreetPlayer += OnGreetPlayer; NetHooks.GreetPlayer += OnGreetPlayer;
NpcHooks.OnStrikeNpc += NpcHooks_OnStrikeNpc; NpcHooks.StrikeNpc += NpcHooks_OnStrikeNpc;
ServerHooks.OnCommand += ServerHooks_OnCommand; ServerHooks.Command += ServerHooks_OnCommand;
AppDomain.CurrentDomain.UnhandledException += CurrentDomain_UnhandledException; AppDomain.CurrentDomain.UnhandledException += CurrentDomain_UnhandledException;
@ -169,16 +169,16 @@ namespace TShockAPI
{ {
Bans.SaveBans(); Bans.SaveBans();
GameHooks.OnPreInitialize -= OnPreInit; GameHooks.Initialize -= OnPreInit;
GameHooks.OnPostInitialize -= OnPostInit; GameHooks.PostInitialize -= OnPostInit;
GameHooks.OnUpdate -= OnUpdate; GameHooks.Update -= OnUpdate;
GameHooks.OnLoadContent -= OnLoadContent; GameHooks.LoadContent -= OnLoadContent;
ServerHooks.OnChat -= OnChat; ServerHooks.Chat -= OnChat;
ServerHooks.OnJoin -= OnJoin; ServerHooks.Join -= OnJoin;
ServerHooks.OnCommand -= ServerHooks_OnCommand; ServerHooks.Command -= ServerHooks_OnCommand;
NetHooks.OnPreGetData -= GetData; NetHooks.GetData -= GetData;
NetHooks.OnGreetPlayer -= OnGreetPlayer; NetHooks.GreetPlayer -= OnGreetPlayer;
NpcHooks.OnStrikeNpc -= NpcHooks_OnStrikeNpc; NpcHooks.StrikeNpc -= NpcHooks_OnStrikeNpc;
} }
/* /*
@ -338,20 +338,6 @@ namespace TShockAPI
} }
} }
} }
else if (e.MsgID == 0x19) // Chat Text
{
using (var br = new BinaryReader(new MemoryStream(e.Msg.readBuffer, e.Index, e.Length)))
{
byte ply = br.ReadByte();
if (e.Msg.whoAmI != ply)
{
Log.Info(Tools.FindPlayer(e.Msg.whoAmI) + " was kicked for trying to fake chat as someone else.");
Ban(ply, "Faking Chat");
e.Handled = true;
}
}
}
else if (e.MsgID == 0x1B) // New Projectile else if (e.MsgID == 0x1B) // New Projectile
{ {
using (var br = new BinaryReader(new MemoryStream(e.Msg.readBuffer, e.Index, e.Length))) using (var br = new BinaryReader(new MemoryStream(e.Msg.readBuffer, e.Index, e.Length)))
@ -478,22 +464,28 @@ namespace TShockAPI
e.Handled = true; e.Handled = true;
} }
private void OnChat(int ply, string msg, HandledEventArgs handler) private void OnChat(messageBuffer msg, int ply, string text, HandledEventArgs e)
{ {
if (Main.netMode != 2) if (Main.netMode != 2)
{
return; return;
if (msg.whoAmI != ply)
{
Log.Info(Tools.FindPlayer(msg.whoAmI) + " was kicked for trying to fake chat as someone else.");
Ban(ply, "Faking Chat");
e.Handled = true;
} }
int x = (int)Main.player[ply].position.X; int x = (int)Main.player[ply].position.X;
int y = (int)Main.player[ply].position.Y; int y = (int)Main.player[ply].position.Y;
if (msg.StartsWith("/")) if (text.StartsWith("/"))
{ {
//Commands.CommandArgs args = new Commands.CommandArgs(msg, x, y, ply); //Commands.CommandArgs args = new Commands.CommandArgs(msg, x, y, ply);
Commands.Command cmd = null; Commands.Command cmd = null;
for (int i = 0; i < Commands.commands.Count; i++) for (int i = 0; i < Commands.commands.Count; i++)
{ {
if (Commands.commands[i].Name().Equals(msg.Split(' ')[0].TrimStart('/'))) if (Commands.commands[i].Name().Equals(text.Split(' ')[0].TrimStart('/')))
{ {
cmd = Commands.commands[i]; cmd = Commands.commands[i];
} }
@ -505,18 +497,18 @@ namespace TShockAPI
} }
else else
{ {
if (!cmd.Run(msg, players[ply])) if (!cmd.Run(text, players[ply]))
{ {
Log.Info(Tools.FindPlayer(ply) + " tried to execute " + cmd.Name() + Log.Info(Tools.FindPlayer(ply) + " tried to execute " + cmd.Name() +
" that s/he did not have access to!"); " that s/he did not have access to!");
Tools.SendMessage(ply, "You do not have access to that command.", new float[] { 255, 0, 0 }); Tools.SendMessage(ply, "You do not have access to that command.", new float[] { 255, 0, 0 });
} }
} }
handler.Handled = true; e.Handled = true;
} }
} }
private void OnJoin(int ply, AllowEventArgs handler) private void OnJoin(int ply, HandledEventArgs handler)
{ {
if (Main.netMode != 2) if (Main.netMode != 2)
{ {