Moved all GetData checks to GetDataHandlers
Fixed GetBanByName not working
This commit is contained in:
ricky
parent
8d1377c7cf
commit
f3be17a911
3 changed files with 596 additions and 554 deletions
426
TShockAPI/GetDataHandlers.cs
Executable file
426
TShockAPI/GetDataHandlers.cs
Executable file
|
|
@ -0,0 +1,426 @@
|
|||
/*
|
||||
TShock, a server mod for Terraria
|
||||
Copyright (C) 2011 The TShock Team
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation, either version 3 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Diagnostics;
|
||||
using System.IO;
|
||||
using System.Text;
|
||||
using Microsoft.Xna.Framework;
|
||||
using StreamBinary;
|
||||
using Terraria;
|
||||
using TerrariaAPI;
|
||||
|
||||
namespace TShockAPI
|
||||
{
|
||||
public delegate bool GetDataHandlerDelegate(GetDataHandlerArgs args);
|
||||
public class GetDataHandlerArgs : EventArgs
|
||||
{
|
||||
public TSPlayer Player { get; private set; }
|
||||
public MemoryStream Data { get; private set; }
|
||||
|
||||
public Player TPlayer
|
||||
{
|
||||
get { return Player.TPlayer; }
|
||||
}
|
||||
|
||||
public GetDataHandlerArgs(TSPlayer player, MemoryStream data)
|
||||
{
|
||||
Player = player;
|
||||
Data = data;
|
||||
}
|
||||
}
|
||||
public static class GetDataHandlers
|
||||
{
|
||||
private static Dictionary<PacketTypes, GetDataHandlerDelegate> GetDataHandlerDelegates;
|
||||
private static bool[] BlacklistTiles;
|
||||
|
||||
public static void InitGetDataHandler()
|
||||
{
|
||||
#region Blacklisted tiles
|
||||
|
||||
BlacklistTiles = new bool[Main.maxTileSets];
|
||||
BlacklistTiles[0] = true;
|
||||
BlacklistTiles[1] = true;
|
||||
BlacklistTiles[2] = true;
|
||||
BlacklistTiles[6] = true;
|
||||
BlacklistTiles[7] = true;
|
||||
BlacklistTiles[8] = true;
|
||||
BlacklistTiles[9] = true;
|
||||
BlacklistTiles[22] = true;
|
||||
BlacklistTiles[23] = true;
|
||||
BlacklistTiles[25] = true;
|
||||
BlacklistTiles[30] = true;
|
||||
BlacklistTiles[37] = true;
|
||||
BlacklistTiles[38] = true;
|
||||
BlacklistTiles[39] = true;
|
||||
BlacklistTiles[40] = true;
|
||||
BlacklistTiles[41] = true;
|
||||
BlacklistTiles[43] = true;
|
||||
BlacklistTiles[44] = true;
|
||||
BlacklistTiles[45] = true;
|
||||
BlacklistTiles[46] = true;
|
||||
BlacklistTiles[47] = true;
|
||||
BlacklistTiles[53] = true;
|
||||
BlacklistTiles[54] = true;
|
||||
BlacklistTiles[56] = true;
|
||||
BlacklistTiles[57] = true;
|
||||
BlacklistTiles[58] = true;
|
||||
BlacklistTiles[59] = true;
|
||||
BlacklistTiles[60] = true;
|
||||
BlacklistTiles[63] = true;
|
||||
BlacklistTiles[64] = true;
|
||||
BlacklistTiles[65] = true;
|
||||
BlacklistTiles[66] = true;
|
||||
BlacklistTiles[67] = true;
|
||||
BlacklistTiles[68] = true;
|
||||
BlacklistTiles[70] = true;
|
||||
BlacklistTiles[75] = true;
|
||||
BlacklistTiles[76] = true;
|
||||
|
||||
#endregion Blacklisted tiles
|
||||
|
||||
GetDataHandlerDelegates = new Dictionary<PacketTypes, GetDataHandlerDelegate>
|
||||
{
|
||||
{PacketTypes.PlayerInfo, HandlePlayerInfo},
|
||||
{PacketTypes.TileSendSection, HandleSendSection},
|
||||
{PacketTypes.PlayerUpdate, HandlePlayerUpdate},
|
||||
{PacketTypes.Tile, HandleTile},
|
||||
{PacketTypes.TileSendSquare, HandleSendTileSquare},
|
||||
{PacketTypes.NPCUpdate, HandleNpcUpdate},
|
||||
{PacketTypes.PlayerDamage, HandlePlayerDamage},
|
||||
{PacketTypes.ProjectileNew, HandleProjectileNew},
|
||||
{PacketTypes.TogglePVP, HandleTogglePvp},
|
||||
{PacketTypes.TileKill, HandleTileKill},
|
||||
{PacketTypes.PlayerKillMe, HandlePlayerKillMe},
|
||||
{PacketTypes.LiquidSet, HandleLiquidSet},
|
||||
};
|
||||
}
|
||||
|
||||
public static bool HandlerGetData(PacketTypes type, TSPlayer player, MemoryStream data)
|
||||
{
|
||||
GetDataHandlerDelegate handler;
|
||||
if (GetDataHandlerDelegates.TryGetValue(type, out handler))
|
||||
{
|
||||
try
|
||||
{
|
||||
return handler(new GetDataHandlerArgs(player, data));
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
Log.Error(ex.ToString());
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
private static bool HandlePlayerInfo(GetDataHandlerArgs args)
|
||||
{
|
||||
byte playerid = args.Data.ReadInt8();
|
||||
byte hair = args.Data.ReadInt8();
|
||||
Color hairColor = new Color(args.Data.ReadInt8(), args.Data.ReadInt8(), args.Data.ReadInt8());
|
||||
Color skinColor = new Color(args.Data.ReadInt8(), args.Data.ReadInt8(), args.Data.ReadInt8());
|
||||
Color eyeColor = new Color(args.Data.ReadInt8(), args.Data.ReadInt8(), args.Data.ReadInt8());
|
||||
Color shirtColor = new Color(args.Data.ReadInt8(), args.Data.ReadInt8(), args.Data.ReadInt8());
|
||||
Color underShirtColor = new Color(args.Data.ReadInt8(), args.Data.ReadInt8(), args.Data.ReadInt8());
|
||||
Color pantsColor = new Color(args.Data.ReadInt8(), args.Data.ReadInt8(), args.Data.ReadInt8());
|
||||
Color shoeColor = new Color(args.Data.ReadInt8(), args.Data.ReadInt8(), args.Data.ReadInt8());
|
||||
string name = Encoding.ASCII.GetString(args.Data.ReadBytes((int) (args.Data.Length - args.Data.Position - 1)));
|
||||
|
||||
if (hair >= Main.maxHair)
|
||||
{
|
||||
Tools.ForceKick(args.Player, "Hair crash exploit.");
|
||||
return true;
|
||||
}
|
||||
|
||||
if (name.Length > 32)
|
||||
{
|
||||
Tools.ForceKick(args.Player, "Name exceeded 32 characters.");
|
||||
return true;
|
||||
}
|
||||
if (name.Trim().Length == 0)
|
||||
{
|
||||
Tools.ForceKick(args.Player, "Empty Name.");
|
||||
return true;
|
||||
}
|
||||
var ban = TShock.Bans.GetBanByName(name);
|
||||
if (ban != null)
|
||||
{
|
||||
Tools.ForceKick(args.Player, string.Format("You are banned: {0}", ban.Reason));
|
||||
return true;
|
||||
}
|
||||
if (args.Player.ReceivedInfo)
|
||||
{
|
||||
return Tools.HandleGriefer(args.Player, "Sent client info more than once");
|
||||
}
|
||||
|
||||
args.Player.ReceivedInfo = true;
|
||||
return false;
|
||||
}
|
||||
|
||||
private static bool HandleSendTileSquare(GetDataHandlerArgs args)
|
||||
{
|
||||
short size = args.Data.ReadInt16();
|
||||
int x = args.Data.ReadInt32();
|
||||
int y = args.Data.ReadInt32();
|
||||
int plyX = Math.Abs(args.Player.TileX);
|
||||
int plyY = Math.Abs(args.Player.TileY);
|
||||
int tileX = Math.Abs(x);
|
||||
int tileY = Math.Abs(y);
|
||||
if (size > 5 || (ConfigurationManager.RangeChecks && (Math.Abs(plyX - tileX) > 32 || Math.Abs(plyY - tileY) > 32)))
|
||||
{
|
||||
Log.Debug(string.Format("SendTileSquare(PlyXY:{0}_{1}, TileXY:{2}_{3}, Result:{4}_{5}, Size:{6})",
|
||||
plyX, plyY, tileX, tileY, Math.Abs(plyX - tileX), Math.Abs(plyY - tileY), size));
|
||||
return Tools.HandleGriefer(args.Player, "Send Tile Square Abuse");
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
private static bool HandleTile(GetDataHandlerArgs args)
|
||||
{
|
||||
byte type = args.Data.ReadInt8();
|
||||
int x = args.Data.ReadInt32();
|
||||
int y = args.Data.ReadInt32();
|
||||
byte tiletype = args.Data.ReadInt8();
|
||||
if (type == 1 || type == 3)
|
||||
{
|
||||
int plyX = Math.Abs(args.Player.TileX);
|
||||
int plyY = Math.Abs(args.Player.TileY);
|
||||
int tileX = Math.Abs(x);
|
||||
int tileY = Math.Abs(y);
|
||||
|
||||
if (ConfigurationManager.RangeChecks && ((Math.Abs(plyX - tileX) > 32) || (Math.Abs(plyY - tileY) > 32)))
|
||||
{
|
||||
Log.Debug(string.Format("TilePlaced(PlyXY:{0}_{1}, TileXY:{2}_{3}, Result:{4}_{5}, Type:{6})",
|
||||
plyX, plyY, tileX, tileY, Math.Abs(plyX - tileX), Math.Abs(plyY - tileY), tiletype));
|
||||
return Tools.HandleGriefer(args.Player, "Placing impossible to place blocks.");
|
||||
}
|
||||
}
|
||||
if (ConfigurationManager.DisableBuild)
|
||||
{
|
||||
if (!args.Player.Group.HasPermission("editspawn"))
|
||||
{
|
||||
args.Player.SendMessage("World protected from changes.", Color.Red);
|
||||
TShock.SendTileSquare(args.Player, x, y);
|
||||
return true;
|
||||
}
|
||||
}
|
||||
if (ConfigurationManager.SpawnProtect)
|
||||
{
|
||||
if (!args.Player.Group.HasPermission("editspawn"))
|
||||
{
|
||||
var flag = TShock.CheckSpawn(x, y);
|
||||
if (flag)
|
||||
{
|
||||
args.Player.SendMessage("Spawn protected from changes.", Color.Red);
|
||||
TShock.SendTileSquare(args.Player, x, y);
|
||||
return true;
|
||||
}
|
||||
}
|
||||
}
|
||||
if (type == 0 && BlacklistTiles[Main.tile[x, y].type] && args.Player.Active)
|
||||
{
|
||||
args.Player.TileThreshold++;
|
||||
var coords = new Vector2(x, y);
|
||||
if (!args.Player.TilesDestroyed.ContainsKey(coords))
|
||||
args.Player.TilesDestroyed.Add(coords, Main.tile[x, y]);
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
private static bool HandleTogglePvp(GetDataHandlerArgs args)
|
||||
{
|
||||
int id = args.Data.ReadByte();
|
||||
bool pvp = args.Data.ReadBoolean();
|
||||
|
||||
args.TPlayer.hostile = pvp;
|
||||
if (id != args.Player.Index)
|
||||
args.TPlayer.hostile = true;
|
||||
if (ConfigurationManager.PermaPvp)
|
||||
args.TPlayer.hostile = true;
|
||||
NetMessage.SendData(30, -1, -1, "", args.Player.Index);
|
||||
return true;
|
||||
}
|
||||
|
||||
private static bool HandleSendSection(GetDataHandlerArgs args)
|
||||
{
|
||||
return Tools.HandleGriefer(args.Player, "SendSection abuse.");
|
||||
}
|
||||
|
||||
private static bool HandleNpcUpdate(GetDataHandlerArgs args)
|
||||
{
|
||||
return Tools.HandleGriefer(args.Player, "Spawn NPC abuse");
|
||||
}
|
||||
|
||||
private static bool HandlePlayerUpdate(GetDataHandlerArgs args)
|
||||
{
|
||||
byte plr = args.Data.ReadInt8();
|
||||
byte control = args.Data.ReadInt8();
|
||||
byte item = args.Data.ReadInt8();
|
||||
float posx = args.Data.ReadSingle();
|
||||
float posy = args.Data.ReadSingle();
|
||||
float velx = args.Data.ReadSingle();
|
||||
float vely = args.Data.ReadSingle();
|
||||
|
||||
if (Main.verboseNetplay)
|
||||
Debug.WriteLine("Update: {{{0},{1}}} {{{2}, {3}}}", (int)posx, (int)posy, (int)velx, (int)vely);
|
||||
|
||||
if (plr != args.Player.Index)
|
||||
{
|
||||
return Tools.HandleGriefer(args.Player, "Update Player abuse");
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
private static bool HandleProjectileNew(GetDataHandlerArgs args)
|
||||
{
|
||||
short ident = args.Data.ReadInt16();
|
||||
float posx = args.Data.ReadSingle();
|
||||
float posy = args.Data.ReadSingle();
|
||||
float velx = args.Data.ReadSingle();
|
||||
float vely = args.Data.ReadSingle();
|
||||
float knockback = args.Data.ReadSingle();
|
||||
short dmg = args.Data.ReadInt16();
|
||||
byte owner = args.Data.ReadInt8();
|
||||
byte type = args.Data.ReadInt8();
|
||||
|
||||
if (type == 29 || type == 28 || type == 37)
|
||||
{
|
||||
Log.Debug(string.Format("Explosive(PlyXY:{0}_{1}, Type:{2})", args.Player.TileX, args.Player.TileY, type));
|
||||
return Tools.HandleExplosivesUser(args.Player, "Throwing an explosive device.");
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
private static bool HandlePlayerKillMe(GetDataHandlerArgs args)
|
||||
{
|
||||
byte id = args.Data.ReadInt8();
|
||||
byte hitdirection = args.Data.ReadInt8();
|
||||
short dmg = args.Data.ReadInt16();
|
||||
bool pvp = args.Data.ReadBoolean();
|
||||
|
||||
if (id != args.Player.Index)
|
||||
{
|
||||
return Tools.HandleGriefer(args.Player, "Trying to execute KillMe on someone else.");
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
private static bool HandlePlayerDamage(GetDataHandlerArgs args)
|
||||
{
|
||||
byte playerid = args.Data.ReadInt8();
|
||||
byte direction = args.Data.ReadInt8();
|
||||
Int16 damage = args.Data.ReadInt16();
|
||||
byte pvp = args.Data.ReadInt8();
|
||||
|
||||
return !TShock.Players[playerid].TPlayer.hostile;
|
||||
}
|
||||
|
||||
private static bool HandleLiquidSet(GetDataHandlerArgs args)
|
||||
{
|
||||
int x = args.Data.ReadInt32();
|
||||
int y = args.Data.ReadInt32();
|
||||
byte liquid = args.Data.ReadInt8();
|
||||
bool lava = args.Data.ReadBoolean();
|
||||
|
||||
//The liquid was picked up.
|
||||
if (liquid == 0)
|
||||
return false;
|
||||
|
||||
int plyX = Math.Abs(args.Player.TileX);
|
||||
int plyY = Math.Abs(args.Player.TileY);
|
||||
int tileX = Math.Abs(x);
|
||||
int tileY = Math.Abs(y);
|
||||
|
||||
bool bucket = false;
|
||||
for (int i = 0; i < 44; i++)
|
||||
{
|
||||
if (args.TPlayer.inventory[i].type >= 205 && args.TPlayer.inventory[i].type <= 207)
|
||||
{
|
||||
bucket = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (lava && !args.Player.Group.HasPermission("canlava"))
|
||||
{
|
||||
args.Player.SendMessage("You do not have permission to use lava", Color.Red);
|
||||
Tools.SendLogs(string.Format("{0} tried using lava", args.Player.Name), Color.Red);
|
||||
// TODO need to revert player changes so they are insync with server
|
||||
return true;
|
||||
}
|
||||
if (!lava && !args.Player.Group.HasPermission("canwater"))
|
||||
{
|
||||
args.Player.SendMessage("You do not have permission to use water", Color.Red);
|
||||
Tools.SendLogs(string.Format("{0} tried using water", args.Player.Name), Color.Red);
|
||||
// TODO need to revert player changes so they are insync with server
|
||||
return true;
|
||||
}
|
||||
|
||||
if (!bucket)
|
||||
{
|
||||
Log.Debug(string.Format("{0}(PlyXY:{1}_{2}, TileXY:{3}_{4}, Result:{5}_{6}, Amount:{7})",
|
||||
lava ? "Lava" : "Water", plyX, plyY, tileX, tileY,
|
||||
Math.Abs(plyX - tileX), Math.Abs(plyY - tileY), liquid));
|
||||
return Tools.HandleGriefer(args.Player, "Manipulating liquid without bucket."); ;
|
||||
}
|
||||
if (ConfigurationManager.RangeChecks && ((Math.Abs(plyX - tileX) > 32) || (Math.Abs(plyY - tileY) > 32)))
|
||||
{
|
||||
Log.Debug(string.Format("Liquid(PlyXY:{0}_{1}, TileXY:{2}_{3}, Result:{4}_{5}, Amount:{6})",
|
||||
plyX, plyY,
|
||||
tileX, tileY,
|
||||
Math.Abs(plyX - tileX), Math.Abs(plyY - tileY),
|
||||
liquid
|
||||
));
|
||||
return Tools.HandleGriefer(args.Player, "Placing impossible to place liquid."); ;
|
||||
}
|
||||
|
||||
if (ConfigurationManager.SpawnProtect)
|
||||
{
|
||||
if (!args.Player.Group.HasPermission("editspawn"))
|
||||
{
|
||||
var flag = TShock.CheckSpawn(x, y);
|
||||
if (flag)
|
||||
{
|
||||
args.Player.SendMessage("The spawn is protected!", Color.Red);
|
||||
// TODO need to revert player changes so they are insync with server
|
||||
return true;
|
||||
}
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
private static bool HandleTileKill(GetDataHandlerArgs args)
|
||||
{
|
||||
int tilex = args.Data.ReadInt32();
|
||||
int tiley = args.Data.ReadInt32();
|
||||
if (tilex < 0 || tilex >= Main.maxTilesX || tiley < 0 || tiley >= Main.maxTilesY)
|
||||
return false;
|
||||
|
||||
if (Main.tile[tilex, tiley].type != 0x15) //Chest
|
||||
{
|
||||
Log.Debug(string.Format("TileKill(TileXY:{0}_{1}, Type:{2})",
|
||||
tilex, tiley, Main.tile[tilex, tiley].type));
|
||||
Tools.ForceKick(args.Player, string.Format("Tile Kill abuse ({0})", Main.tile[tilex, tiley].type));
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
}
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue