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

Refactor out spaces -> tabs

Browse source 
Remove checks to the itemban table for npcs(wtf zidonuke) and projectiles.
This commit is contained in:
Zack Piispanen 2014-04-21 17:24:46 -04:00
parent 84d8049ac6
commit c8a4fd711f
5 changed files with 413 additions and 405 deletions
Download patch file Download diff file Expand all files Collapse all files

357
TShockAPI/Commands.cs
View file

@ -2773,183 +2773,206 @@ namespace TShockAPI
} }
#endregion Item Management #endregion Item Management
#region Projectile Management #region Projectile Management
private static void ProjectileBan(CommandArgs args) private static void ProjectileBan(CommandArgs args)
{ {
if (args.Parameters.Count == 0) if (args.Parameters.Count == 0)
{ {
args.Player.SendInfoMessage("Invalid syntax! Proper syntax: /projban <command> [arguments]"); args.Player.SendInfoMessage("Invalid syntax! Proper syntax: /projban <command> [arguments]");
args.Player.SendInfoMessage("Commands: add, allow, del, disallow, list"); args.Player.SendInfoMessage("Commands: add, allow, del, disallow, list");
args.Player.SendInfoMessage("Arguments: add <proj id>, allow <proj id> <group name>"); args.Player.SendInfoMessage("Arguments: add <proj id>, allow <proj id> <group name>");
args.Player.SendInfoMessage("Arguments: del <proj id>, disallow <proj id> <group name>, list [page]"); args.Player.SendInfoMessage("Arguments: del <proj id>, disallow <proj id> <group name>, list [page]");
return; return;
} }
switch (args.Parameters[0].ToLower()) switch (args.Parameters[0].ToLower())
{ {
case "add": case "add":
#region Add projectile
{
if (args.Parameters.Count != 2)
{
args.Player.SendErrorMessage("Invalid syntax! Proper syntax: /projban add <proj id>");
return;
}
short id;
if (Int16.TryParse(args.Parameters[1], out id))
{
TShock.ProjectileBans.AddNewBan(id);
args.Player.SendSuccessMessage("Banned Projectile: " + id + ".");
return;
}
else
{
args.Player.SendErrorMessage("Invalid syntax! Projectile Id must be a number.");
return;
}
} #region Add projectile
#endregion
return;
case "allow":
#region Allow group to projectile
{
if (args.Parameters.Count != 3)
{
args.Player.SendErrorMessage("Invalid syntax! Proper syntax: /projban allow <id> <group name>");
return;
}
short id; {
if (Int16.TryParse(args.Parameters[1], out id)) if (args.Parameters.Count != 2)
{ {
if (!TShock.Groups.GroupExists(args.Parameters[2])) args.Player.SendErrorMessage("Invalid syntax! Proper syntax: /projban add <proj id>");
{ return;
args.Player.SendErrorMessage("Invalid group."); }
return; short id;
} if (Int16.TryParse(args.Parameters[1], out id))
{
TShock.ProjectileBans.AddNewBan(id);
args.Player.SendSuccessMessage("Banned Projectile: " + id + ".");
return;
}
else
{
args.Player.SendErrorMessage("Invalid syntax! Projectile Id must be a number.");
return;
}
ProjectileBan ban = TShock.ProjectileBans.GetBanById(id); }
if (ban == null)
{
args.Player.SendErrorMessage("Projectile " + id + " is not banned.");
return;
}
if (!ban.AllowedGroups.Contains(args.Parameters[2]))
{
TShock.ProjectileBans.AllowGroup(id, args.Parameters[2]);
args.Player.SendSuccessMessage(String.Format("{0} has been allowed to use projectile {1}.", args.Parameters[2], id));
return;
}
else
{
args.Player.SendWarningMessage(String.Format("{0} is already allowed to use projectile {1}.", args.Parameters[2], id));
return;
}
}
else
{
args.Player.SendErrorMessage("Invalid syntax! Projectile Id must be a number.");
return;
}
}
#endregion
case "del": #endregion
#region Delete item
{
if (args.Parameters.Count != 2)
{
args.Player.SendErrorMessage("Invalid syntax! Proper syntax: /projban del <id>");
return;
}
short id; return;
if (Int16.TryParse(args.Parameters[1], out id)) case "allow":
{
TShock.ProjectileBans.RemoveBan(id);
args.Player.SendSuccessMessage("Unbanned Projectile: " + id + ".");
return;
}
else
{
args.Player.SendErrorMessage("Invalid syntax! Projectile Id must be a number.");
return;
}
}
#endregion
return;
case "disallow":
#region Allow group to item
{
if (args.Parameters.Count != 3)
{
args.Player.SendErrorMessage("Invalid syntax! Proper syntax: /projban disallow <id> <group name>");
return;
}
short id; #region Allow group to projectile
if (Int16.TryParse(args.Parameters[1], out id))
{
if (!TShock.Groups.GroupExists(args.Parameters[2]))
{
args.Player.SendErrorMessage("Invalid group.");
return;
}
ProjectileBan ban = TShock.ProjectileBans.GetBanById(id); {
if (ban == null) if (args.Parameters.Count != 3)
{ {
args.Player.SendErrorMessage("Projectile " + id + " is not banned."); args.Player.SendErrorMessage("Invalid syntax! Proper syntax: /projban allow <id> <group name>");
return; return;
} }
if (ban.AllowedGroups.Contains(args.Parameters[2]))
{
TShock.ProjectileBans.RemoveGroup(id, args.Parameters[2]);
args.Player.SendSuccessMessage(String.Format("{0} has been disallowed from using projectile {1}.", args.Parameters[2], id));
return;
}
else
{
args.Player.SendWarningMessage(String.Format("{0} is already prevented from using projectile {1}.", args.Parameters[2], id));
return;
}
}
else
{
args.Player.SendErrorMessage("Invalid syntax! Projectile Id must be a number.");
return;
}
}
#endregion
return;
case "help":
args.Player.SendInfoMessage("Syntax: /projban <command> [arguments]");
args.Player.SendInfoMessage("Commands: add, allow, del, disallow, list");
args.Player.SendInfoMessage("Arguments: add <id>, allow <id> <group name>");
args.Player.SendInfoMessage("Arguments: del <id>, disallow <id> <group name>, list [page]");
return;
case "list":
#region List items
int pageNumber;
if (!PaginationTools.TryParsePageNumber(args.Parameters, 1, args.Player, out pageNumber))
return;
IEnumerable<Int16> projectileIds = from projectileBan in TShock.ProjectileBans.ProjectileBans
select projectileBan.ID;
PaginationTools.SendPage(args.Player, pageNumber, PaginationTools.BuildLinesFromTerms(projectileIds),
new PaginationTools.Settings
{
HeaderFormat = "Projectile bans ({0}/{1}):",
FooterFormat = "Type /Projectile list {0} for more.",
NothingToDisplayString = "There are currently no banned projectiles."
});
#endregion
return;
}
}
#endregion Projectile Management short id;
if (Int16.TryParse(args.Parameters[1], out id))
{
if (!TShock.Groups.GroupExists(args.Parameters[2]))
{
args.Player.SendErrorMessage("Invalid group.");
return;
}
ProjectileBan ban = TShock.ProjectileBans.GetBanById(id);
if (ban == null)
{
args.Player.SendErrorMessage("Projectile " + id + " is not banned.");
return;
}
if (!ban.AllowedGroups.Contains(args.Parameters[2]))
{
TShock.ProjectileBans.AllowGroup(id, args.Parameters[2]);
args.Player.SendSuccessMessage(String.Format("{0} has been allowed to use projectile {1}.", args.Parameters[2],
id));
return;
}
else
{
args.Player.SendWarningMessage(String.Format("{0} is already allowed to use projectile {1}.", args.Parameters[2],
id));
return;
}
}
else
{
args.Player.SendErrorMessage("Invalid syntax! Projectile Id must be a number.");
return;
}
}
#endregion
case "del":
#region Delete item
{
if (args.Parameters.Count != 2)
{
args.Player.SendErrorMessage("Invalid syntax! Proper syntax: /projban del <id>");
return;
}
short id;
if (Int16.TryParse(args.Parameters[1], out id))
{
TShock.ProjectileBans.RemoveBan(id);
args.Player.SendSuccessMessage("Unbanned Projectile: " + id + ".");
return;
}
else
{
args.Player.SendErrorMessage("Invalid syntax! Projectile Id must be a number.");
return;
}
}
#endregion
return;
case "disallow":
#region Allow group to item
{
if (args.Parameters.Count != 3)
{
args.Player.SendErrorMessage("Invalid syntax! Proper syntax: /projban disallow <id> <group name>");
return;
}
short id;
if (Int16.TryParse(args.Parameters[1], out id))
{
if (!TShock.Groups.GroupExists(args.Parameters[2]))
{
args.Player.SendErrorMessage("Invalid group.");
return;
}
ProjectileBan ban = TShock.ProjectileBans.GetBanById(id);
if (ban == null)
{
args.Player.SendErrorMessage("Projectile " + id + " is not banned.");
return;
}
if (ban.AllowedGroups.Contains(args.Parameters[2]))
{
TShock.ProjectileBans.RemoveGroup(id, args.Parameters[2]);
args.Player.SendSuccessMessage(String.Format("{0} has been disallowed from using projectile {1}.",
args.Parameters[2], id));
return;
}
else
{
args.Player.SendWarningMessage(String.Format("{0} is already prevented from using projectile {1}.",
args.Parameters[2], id));
return;
}
}
else
{
args.Player.SendErrorMessage("Invalid syntax! Projectile Id must be a number.");
return;
}
}
#endregion
return;
case "help":
args.Player.SendInfoMessage("Syntax: /projban <command> [arguments]");
args.Player.SendInfoMessage("Commands: add, allow, del, disallow, list");
args.Player.SendInfoMessage("Arguments: add <id>, allow <id> <group name>");
args.Player.SendInfoMessage("Arguments: del <id>, disallow <id> <group name>, list [page]");
return;
case "list":
#region List items
int pageNumber;
if (!PaginationTools.TryParsePageNumber(args.Parameters, 1, args.Player, out pageNumber))
return;
IEnumerable<Int16> projectileIds = from projectileBan in TShock.ProjectileBans.ProjectileBans
select projectileBan.ID;
PaginationTools.SendPage(args.Player, pageNumber, PaginationTools.BuildLinesFromTerms(projectileIds),
new PaginationTools.Settings
{
HeaderFormat = "Projectile bans ({0}/{1}):",
FooterFormat = "Type /Projectile list {0} for more.",
NothingToDisplayString = "There are currently no banned projectiles."
});
#endregion
return;
}
}
#endregion Projectile Management
#region Server Config Commands #region Server Config Commands

398
TShockAPI/DB/ProjectileManager.cs
View file

@ -24,230 +24,230 @@ using MySql.Data.MySqlClient;
namespace TShockAPI.DB namespace TShockAPI.DB
{ {
public class ProjectileManagager public class ProjectileManagager
{ {
private IDbConnection database; private IDbConnection database;
public List<ProjectileBan> ProjectileBans = new List<ProjectileBan>(); public List<ProjectileBan> ProjectileBans = new List<ProjectileBan>();
public ProjectileManagager(IDbConnection db) public ProjectileManagager(IDbConnection db)
{ {
database = db; database = db;
var table = new SqlTable("ProjectileBans", var table = new SqlTable("ProjectileBans",
new SqlColumn("ProjectileID", MySqlDbType.Int32) { Primary = true }, new SqlColumn("ProjectileID", MySqlDbType.Int32) {Primary = true},
new SqlColumn("AllowedGroups", MySqlDbType.Text) new SqlColumn("AllowedGroups", MySqlDbType.Text)
); );
var creator = new SqlTableCreator(db, var creator = new SqlTableCreator(db,
db.GetSqlType() == SqlType.Sqlite db.GetSqlType() == SqlType.Sqlite
? (IQueryBuilder)new SqliteQueryCreator() ? (IQueryBuilder) new SqliteQueryCreator()
: new MysqlQueryCreator()); : new MysqlQueryCreator());
creator.EnsureExists(table); creator.EnsureExists(table);
UpdateBans(); UpdateBans();
} }
public void UpdateBans() public void UpdateBans()
{ {
ProjectileBans.Clear(); ProjectileBans.Clear();
using (var reader = database.QueryReader("SELECT * FROM ProjectileBans")) using (var reader = database.QueryReader("SELECT * FROM ProjectileBans"))
{ {
while (reader != null && reader.Read()) while (reader != null && reader.Read())
{ {
ProjectileBan ban = new ProjectileBan((short)reader.Get<Int32>("ProjectileID")); ProjectileBan ban = new ProjectileBan((short) reader.Get<Int32>("ProjectileID"));
ban.SetAllowedGroups(reader.Get<string>("AllowedGroups")); ban.SetAllowedGroups(reader.Get<string>("AllowedGroups"));
ProjectileBans.Add(ban); ProjectileBans.Add(ban);
} }
} }
} }
public void AddNewBan(short id = 0) public void AddNewBan(short id = 0)
{ {
try try
{ {
database.Query("INSERT INTO ProjectileBans (ProjectileID, AllowedGroups) VALUES (@0, @1);", database.Query("INSERT INTO ProjectileBans (ProjectileID, AllowedGroups) VALUES (@0, @1);",
id, ""); id, "");
if (!ProjectileIsBanned(id, null)) if (!ProjectileIsBanned(id, null))
ProjectileBans.Add(new ProjectileBan(id)); ProjectileBans.Add(new ProjectileBan(id));
} }
catch (Exception ex) catch (Exception ex)
{ {
Log.Error(ex.ToString()); Log.Error(ex.ToString());
} }
} }
public void RemoveBan(short id) public void RemoveBan(short id)
{ {
if (!ProjectileIsBanned(id, null)) if (!ProjectileIsBanned(id, null))
return; return;
try try
{ {
database.Query("DELETE FROM ProjectileBans WHERE ProjectileId=@0;", id); database.Query("DELETE FROM ProjectileBans WHERE ProjectileId=@0;", id);
ProjectileBans.Remove(new ProjectileBan(id)); ProjectileBans.Remove(new ProjectileBan(id));
} }
catch (Exception ex) catch (Exception ex)
{ {
Log.Error(ex.ToString()); Log.Error(ex.ToString());
} }
} }
public bool ProjectileIsBanned(short id) public bool ProjectileIsBanned(short id)
{ {
if (ProjectileBans.Contains(new ProjectileBan(id))) if (ProjectileBans.Contains(new ProjectileBan(id)))
{ {
return true; return true;
} }
return false; return false;
} }
public bool ProjectileIsBanned(short id, TSPlayer ply) public bool ProjectileIsBanned(short id, TSPlayer ply)
{ {
if (ProjectileBans.Contains(new ProjectileBan(id))) if (ProjectileBans.Contains(new ProjectileBan(id)))
{ {
ProjectileBan b = GetBanById(id); ProjectileBan b = GetBanById(id);
return !b.HasPermissionToCreateProjectile(ply); return !b.HasPermissionToCreateProjectile(ply);
} }
return false; return false;
} }
public bool AllowGroup(short id, string name) public bool AllowGroup(short id, string name)
{ {
string groupsNew = ""; string groupsNew = "";
ProjectileBan b = GetBanById(id); ProjectileBan b = GetBanById(id);
if (b != null) if (b != null)
{ {
try try
{ {
groupsNew = String.Join(",", b.AllowedGroups); groupsNew = String.Join(",", b.AllowedGroups);
if (groupsNew.Length > 0) if (groupsNew.Length > 0)
groupsNew += ","; groupsNew += ",";
groupsNew += name; groupsNew += name;
b.SetAllowedGroups(groupsNew); b.SetAllowedGroups(groupsNew);
int q = database.Query("UPDATE ProjectileBans SET AllowedGroups=@0 WHERE ProjectileId=@1", groupsNew, int q = database.Query("UPDATE ProjectileBans SET AllowedGroups=@0 WHERE ProjectileId=@1", groupsNew,
id); id);
return q > 0; return q > 0;
} }
catch (Exception ex) catch (Exception ex)
{ {
Log.Error(ex.ToString()); Log.Error(ex.ToString());
} }
} }
return false; return false;
} }
public bool RemoveGroup(short id, string group) public bool RemoveGroup(short id, string group)
{ {
ProjectileBan b = GetBanById(id); ProjectileBan b = GetBanById(id);
if (b != null) if (b != null)
{ {
try try
{ {
b.RemoveGroup(group); b.RemoveGroup(group);
string groups = string.Join(",", b.AllowedGroups); string groups = string.Join(",", b.AllowedGroups);
int q = database.Query("UPDATE ProjectileBans SET AllowedGroups=@0 WHERE ProjectileId=@1", groups, int q = database.Query("UPDATE ProjectileBans SET AllowedGroups=@0 WHERE ProjectileId=@1", groups,
id); id);
if (q > 0) if (q > 0)
return true; return true;
} }
catch (Exception ex) catch (Exception ex)
{ {
Log.Error(ex.ToString()); Log.Error(ex.ToString());
} }
} }
return false; return false;
} }
public ProjectileBan GetBanById(short id) public ProjectileBan GetBanById(short id)
{ {
foreach (ProjectileBan b in ProjectileBans) foreach (ProjectileBan b in ProjectileBans)
{ {
if (b.ID == id) if (b.ID == id)
{ {
return b; return b;
} }
} }
return null; return null;
} }
} }
public class ProjectileBan : IEquatable<ProjectileBan> public class ProjectileBan : IEquatable<ProjectileBan>
{ {
public short ID { get; set; } public short ID { get; set; }
public List<string> AllowedGroups { get; set; } public List<string> AllowedGroups { get; set; }
public ProjectileBan(short id) public ProjectileBan(short id)
: this() : this()
{ {
ID = id; ID = id;
AllowedGroups = new List<string>(); AllowedGroups = new List<string>();
} }
public ProjectileBan() public ProjectileBan()
{ {
ID = 0; ID = 0;
AllowedGroups = new List<string>(); AllowedGroups = new List<string>();
} }
public bool Equals(ProjectileBan other) public bool Equals(ProjectileBan other)
{ {
return ID == other.ID; return ID == other.ID;
} }
public bool HasPermissionToCreateProjectile(TSPlayer ply) public bool HasPermissionToCreateProjectile(TSPlayer ply)
{ {
if (ply == null) if (ply == null)
return false; return false;
if (ply.Group.HasPermission(Permissions.canusebannedprojectiles)) if (ply.Group.HasPermission(Permissions.canusebannedprojectiles))
return true; return true;
var cur = ply.Group; var cur = ply.Group;
var traversed = new List<Group>(); var traversed = new List<Group>();
while (cur != null) while (cur != null)
{ {
if (AllowedGroups.Contains(cur.Name)) if (AllowedGroups.Contains(cur.Name))
{ {
return true; return true;
} }
if (traversed.Contains(cur)) if (traversed.Contains(cur))
{ {
throw new InvalidOperationException("Infinite group parenting ({0})".SFormat(cur.Name)); throw new InvalidOperationException("Infinite group parenting ({0})".SFormat(cur.Name));
} }
traversed.Add(cur); traversed.Add(cur);
cur = cur.Parent; cur = cur.Parent;
} }
return false; return false;
// could add in the other permissions in this class instead of a giant if switch. // could add in the other permissions in this class instead of a giant if switch.
} }
public void SetAllowedGroups(String groups) public void SetAllowedGroups(String groups)
{ {
// prevent null pointer exceptions // prevent null pointer exceptions
if (!string.IsNullOrEmpty(groups)) if (!string.IsNullOrEmpty(groups))
{ {
List<String> groupArr = groups.Split(',').ToList(); List<String> groupArr = groups.Split(',').ToList();
for (int i = 0; i < groupArr.Count; i++) for (int i = 0; i < groupArr.Count; i++)
{ {
groupArr[i] = groupArr[i].Trim(); groupArr[i] = groupArr[i].Trim();
//Console.WriteLine(groupArr[i]); //Console.WriteLine(groupArr[i]);
} }
AllowedGroups = groupArr; AllowedGroups = groupArr;
} }
} }
public bool RemoveGroup(string groupName) public bool RemoveGroup(string groupName)
{ {
return AllowedGroups.Remove(groupName); return AllowedGroups.Remove(groupName);
} }
public override string ToString() public override string ToString()
{ {
return ID + (AllowedGroups.Count > 0 ? " (" + String.Join(",", AllowedGroups) + ")" : ""); return ID + (AllowedGroups.Count > 0 ? " (" + String.Join(",", AllowedGroups) + ")" : "");
} }
} }
} }

16
TShockAPI/GetDataHandlers.cs
View file

@ -2393,17 +2393,17 @@ namespace TShockAPI
if (index > Main.maxProjectiles || index < 0) if (index > Main.maxProjectiles || index < 0)
{ {
args.Player.RemoveProjectile(ident, owner); args.Player.RemoveProjectile(ident, owner);
return true; return true;
} }
if (TShock.ProjectileBans.ProjectileIsBanned(type, args.Player)) if (TShock.ProjectileBans.ProjectileIsBanned(type, args.Player))
{ {
args.Player.Disable("Player does not have permission to create that projectile.", true); args.Player.Disable("Player does not have permission to create that projectile.", true);
args.Player.SendErrorMessage("You do not have permission to create that projectile."); args.Player.SendErrorMessage("You do not have permission to create that projectile.");
args.Player.RemoveProjectile(ident, owner); args.Player.RemoveProjectile(ident, owner);
return false; return false;
} }
// Server now checks owner + ident, if owner is different, server will create new projectile. // Server now checks owner + ident, if owner is different, server will create new projectile.
/*if (args.Player.Index != owner) /*if (args.Player.Index != owner)
{ {

24
TShockAPI/Permissions.cs
View file

@ -64,8 +64,8 @@ namespace TShockAPI
[Description("User can manage item bans.")] [Description("User can manage item bans.")]
public static readonly string manageitem = "tshock.admin.itemban"; public static readonly string manageitem = "tshock.admin.itemban";
[Description("User can manage projectile bans.")] [Description("User can manage projectile bans.")]
public static readonly string manageprojectile = "tshock.admin.projectileban"; public static readonly string manageprojectile = "tshock.admin.projectileban";
[Description("User can manage groups.")] [Description("User can manage groups.")]
public static readonly string managegroup = "tshock.admin.group"; public static readonly string managegroup = "tshock.admin.group";
@ -325,14 +325,14 @@ namespace TShockAPI
[Description("Player can chat")] [Description("Player can chat")]
public static readonly string canchat = "tshock.canchat"; public static readonly string canchat = "tshock.canchat";
[Description("Player can use banned projectiles.")] [Description("Player can use banned projectiles.")]
public static readonly string canusebannedprojectiles = "tshock.projectiles.usebanned"; public static readonly string canusebannedprojectiles = "tshock.projectiles.usebanned";
/// <summary> /// <summary>
/// Lists all commands associated with a given permission /// Lists all commands associated with a given permission
/// </summary> /// </summary>
/// <param name="perm">string permission - the permission to get information on</param> /// <param name="perm">string permission - the permission to get information on</param>
/// <returns>List of commands</returns> /// <returns>List of commands</returns>
private static List<Command> GetCommands(string perm) private static List<Command> GetCommands(string perm)
{ {
if (Commands.ChatCommands.Count < 1) if (Commands.ChatCommands.Count < 1)
@ -340,9 +340,9 @@ namespace TShockAPI
return Commands.ChatCommands.Where(c => c.Permissions.Contains(perm)).ToList(); return Commands.ChatCommands.Where(c => c.Permissions.Contains(perm)).ToList();
} }
/// <summary> /// <summary>
/// Dumps the descriptions of each permission to a file in Markdown format. /// Dumps the descriptions of each permission to a file in Markdown format.
/// </summary> /// </summary>
public static void DumpDescriptions() public static void DumpDescriptions()
{ {
var sb = new StringBuilder(); var sb = new StringBuilder();

19
TShockAPI/TShock.cs
View file

@ -62,7 +62,7 @@ namespace TShockAPI
public static GroupManager Groups; public static GroupManager Groups;
public static UserManager Users; public static UserManager Users;
public static ItemManager Itembans; public static ItemManager Itembans;
public static ProjectileManagager ProjectileBans; public static ProjectileManagager ProjectileBans;
public static RememberedPosManager RememberedPos; public static RememberedPosManager RememberedPos;
public static CharacterManager CharacterDB; public static CharacterManager CharacterDB;
public static ConfigFile Config { get; set; } public static ConfigFile Config { get; set; }
@ -224,7 +224,7 @@ namespace TShockAPI
Users = new UserManager(DB); Users = new UserManager(DB);
Groups = new GroupManager(DB); Groups = new GroupManager(DB);
Itembans = new ItemManager(DB); Itembans = new ItemManager(DB);
ProjectileBans = new ProjectileManagager(DB); ProjectileBans = new ProjectileManagager(DB);
RememberedPos = new RememberedPosManager(DB); RememberedPos = new RememberedPosManager(DB);
CharacterDB = new CharacterManager(DB); CharacterDB = new CharacterManager(DB);
RestApi = new SecureRest(Netplay.serverListenIP, Config.RestApiPort); RestApi = new SecureRest(Netplay.serverListenIP, Config.RestApiPort);
@ -251,7 +251,6 @@ namespace TShockAPI
ServerApi.Hooks.NetSendData.Register(this, NetHooks_SendData); ServerApi.Hooks.NetSendData.Register(this, NetHooks_SendData);
ServerApi.Hooks.NetGreetPlayer.Register(this, OnGreetPlayer); ServerApi.Hooks.NetGreetPlayer.Register(this, OnGreetPlayer);
ServerApi.Hooks.NpcStrike.Register(this, NpcHooks_OnStrikeNpc); ServerApi.Hooks.NpcStrike.Register(this, NpcHooks_OnStrikeNpc);
ServerApi.Hooks.NpcSetDefaultsInt.Register(this, OnNpcSetDefaults);
ServerApi.Hooks.ProjectileSetDefaults.Register(this, OnProjectileSetDefaults); ServerApi.Hooks.ProjectileSetDefaults.Register(this, OnProjectileSetDefaults);
ServerApi.Hooks.WorldStartHardMode.Register(this, OnStartHardMode); ServerApi.Hooks.WorldStartHardMode.Register(this, OnStartHardMode);
ServerApi.Hooks.WorldSave.Register(this, SaveManager.Instance.OnSaveWorld); ServerApi.Hooks.WorldSave.Register(this, SaveManager.Instance.OnSaveWorld);
@ -329,7 +328,6 @@ namespace TShockAPI
ServerApi.Hooks.NetSendData.Deregister(this, NetHooks_SendData); ServerApi.Hooks.NetSendData.Deregister(this, NetHooks_SendData);
ServerApi.Hooks.NetGreetPlayer.Deregister(this, OnGreetPlayer); ServerApi.Hooks.NetGreetPlayer.Deregister(this, OnGreetPlayer);
ServerApi.Hooks.NpcStrike.Deregister(this, NpcHooks_OnStrikeNpc); ServerApi.Hooks.NpcStrike.Deregister(this, NpcHooks_OnStrikeNpc);
ServerApi.Hooks.NpcSetDefaultsInt.Deregister(this, OnNpcSetDefaults);
ServerApi.Hooks.ProjectileSetDefaults.Deregister(this, OnProjectileSetDefaults); ServerApi.Hooks.ProjectileSetDefaults.Deregister(this, OnProjectileSetDefaults);
ServerApi.Hooks.WorldStartHardMode.Deregister(this, OnStartHardMode); ServerApi.Hooks.WorldStartHardMode.Deregister(this, OnStartHardMode);
ServerApi.Hooks.WorldSave.Deregister(this, SaveManager.Instance.OnSaveWorld); ServerApi.Hooks.WorldSave.Deregister(this, SaveManager.Instance.OnSaveWorld);
@ -1276,14 +1274,6 @@ namespace TShockAPI
e.Object.SetDefaults(0); e.Object.SetDefaults(0);
} }
private void OnNpcSetDefaults(SetDefaultsEventArgs<NPC, int> e)
{
if (Itembans.ItemIsBanned(e.Object.name, null))
{
e.Object.SetDefaults(0);
}
}
/// <summary> /// <summary>
/// Send bytes to client using packetbuffering if available /// Send bytes to client using packetbuffering if available
/// </summary> /// </summary>
@ -1528,11 +1518,6 @@ namespace TShockAPI
Projectile proj = new Projectile(); Projectile proj = new Projectile();
proj.SetDefaults(type); proj.SetDefaults(type);
if (Itembans.ItemIsBanned(proj.name, player))
{
return true;
}
if (Main.projHostile[type]) if (Main.projHostile[type])
{ {
//player.SendMessage( proj.name, Color.Yellow); //player.SendMessage( proj.name, Color.Yellow);