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

Blocks Npc data and sendsection packets.

Browse source
This commit is contained in:
high 2011-06-01 22:55:01 -04:00
parent d48426adfd
commit 1909e3b5d0
1 changed files with 24 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

47
TShockAPI/TShock.cs
View file

@ -1,11 +1,11 @@
using System; using System;
using System.IO; using System.IO;
using System.Net; using System.Net;
using System.Text.RegularExpressions;
using Microsoft.Xna.Framework; using Microsoft.Xna.Framework;
using Terraria; using Terraria;
using TerrariaAPI; using TerrariaAPI;
using TerrariaAPI.Hooks; using TerrariaAPI.Hooks;
using System.Text.RegularExpressions;
namespace TShockAPI namespace TShockAPI
{ {
@ -91,15 +91,6 @@ namespace TShockAPI
} }
} }
void OnPreGetData(byte id, messageBuffer msg, int idx, int length, HandledEventArgs e)
{
if (Main.netMode != 2) { return; }
if (id == 0x1e && ConfigurationManager.permaPvp)
{
e.Handled = true;
}
}
void GetData(GetDataEventArgs e) void GetData(GetDataEventArgs e)
{ {
if (Main.netMode != 2) { return; } if (Main.netMode != 2) { return; }
@ -126,6 +117,16 @@ namespace TShockAPI
NetMessage.SendData(30, -1, -1, "", e.Msg.whoAmI); NetMessage.SendData(30, -1, -1, "", e.Msg.whoAmI);
e.Handled = true; e.Handled = true;
} }
if (e.MsgID == 0x0A) //SendSection
{
Tools.Broadcast(string.Format("{0}({1}) attempted sending a section", Main.player[e.Msg.whoAmI].name, e.Msg.whoAmI));
e.Handled = true;
}
if (e.MsgID == 0x17) //Npc Data
{
Tools.Broadcast(string.Format("{0}({1}) attempted spawning an NPC", Main.player[e.Msg.whoAmI].name, e.Msg.whoAmI));
e.Handled = true;
}
} }
void OnGreetPlayer(int who, HandledEventArgs e) void OnGreetPlayer(int who, HandledEventArgs e)
@ -282,23 +283,23 @@ namespace TShockAPI
if (msg.Length > 3 && msg.Substring(0, 3) == "/tp") if (msg.Length > 3 && msg.Substring(0, 3) == "/tp")
{ {
string player = msg.Remove(0, 3).Trim(); string player = msg.Remove(0, 3).Trim();
if (Tools.FindPlayer(player) != -1 && player != "") if (Tools.FindPlayer(player) != -1 && player != "")
{ {
Teleport(ply, Main.player[Tools.FindPlayer(player)].position.X, Main.player[Tools.FindPlayer(player)].position.Y); Teleport(ply, Main.player[Tools.FindPlayer(player)].position.X, Main.player[Tools.FindPlayer(player)].position.Y);
Tools.SendMessage(ply, "Teleported to " + player); Tools.SendMessage(ply, "Teleported to " + player);
handler.Handled = true; handler.Handled = true;
} }
} }
if (msg.Length > 7 && msg.Substring(0, 7) == "/tphere") if (msg.Length > 7 && msg.Substring(0, 7) == "/tphere")
{ {
string player = msg.Remove(0, 7).Trim(); string player = msg.Remove(0, 7).Trim();
if (Tools.FindPlayer(player) != -1 && player != "") if (Tools.FindPlayer(player) != -1 && player != "")
{ {
Teleport(Tools.FindPlayer(player), Main.player[ply].position.X, Main.player[ply].position.Y); Teleport(Tools.FindPlayer(player), Main.player[ply].position.X, Main.player[ply].position.Y);
Tools.SendMessage(Tools.FindPlayer(player), "You were teleported to " + Tools.FindPlayer(ply) + "."); Tools.SendMessage(Tools.FindPlayer(player), "You were teleported to " + Tools.FindPlayer(ply) + ".");
Tools.SendMessage(ply, "You brought " + player + " here."); Tools.SendMessage(ply, "You brought " + player + " here.");
handler.Handled = true; handler.Handled = true;
} }
} }
if (msg.StartsWith("/spawnmob")) if (msg.StartsWith("/spawnmob"))
{ {