Refactor out spaces -> tabs
Remove checks to the itemban table for npcs(wtf zidonuke) and projectiles.
This commit is contained in:
parent
84d8049ac6
commit
c8a4fd711f
5 changed files with 413 additions and 405 deletions
|
|
@ -2789,7 +2789,9 @@ namespace TShockAPI
|
||||||
switch (args.Parameters[0].ToLower())
|
switch (args.Parameters[0].ToLower())
|
||||||
{
|
{
|
||||||
case "add":
|
case "add":
|
||||||
|
|
||||||
#region Add projectile
|
#region Add projectile
|
||||||
|
|
||||||
{
|
{
|
||||||
if (args.Parameters.Count != 2)
|
if (args.Parameters.Count != 2)
|
||||||
{
|
{
|
||||||
|
|
@ -2810,10 +2812,14 @@ namespace TShockAPI
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
return;
|
return;
|
||||||
case "allow":
|
case "allow":
|
||||||
|
|
||||||
#region Allow group to projectile
|
#region Allow group to projectile
|
||||||
|
|
||||||
{
|
{
|
||||||
if (args.Parameters.Count != 3)
|
if (args.Parameters.Count != 3)
|
||||||
{
|
{
|
||||||
|
|
@ -2839,12 +2845,14 @@ namespace TShockAPI
|
||||||
if (!ban.AllowedGroups.Contains(args.Parameters[2]))
|
if (!ban.AllowedGroups.Contains(args.Parameters[2]))
|
||||||
{
|
{
|
||||||
TShock.ProjectileBans.AllowGroup(id, 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));
|
args.Player.SendSuccessMessage(String.Format("{0} has been allowed to use projectile {1}.", args.Parameters[2],
|
||||||
|
id));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
args.Player.SendWarningMessage(String.Format("{0} is already allowed to use projectile {1}.", args.Parameters[2], id));
|
args.Player.SendWarningMessage(String.Format("{0} is already allowed to use projectile {1}.", args.Parameters[2],
|
||||||
|
id));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -2854,10 +2862,13 @@ namespace TShockAPI
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
case "del":
|
case "del":
|
||||||
|
|
||||||
#region Delete item
|
#region Delete item
|
||||||
|
|
||||||
{
|
{
|
||||||
if (args.Parameters.Count != 2)
|
if (args.Parameters.Count != 2)
|
||||||
{
|
{
|
||||||
|
|
@ -2878,10 +2889,14 @@ namespace TShockAPI
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
return;
|
return;
|
||||||
case "disallow":
|
case "disallow":
|
||||||
|
|
||||||
#region Allow group to item
|
#region Allow group to item
|
||||||
|
|
||||||
{
|
{
|
||||||
if (args.Parameters.Count != 3)
|
if (args.Parameters.Count != 3)
|
||||||
{
|
{
|
||||||
|
|
@ -2907,12 +2922,14 @@ namespace TShockAPI
|
||||||
if (ban.AllowedGroups.Contains(args.Parameters[2]))
|
if (ban.AllowedGroups.Contains(args.Parameters[2]))
|
||||||
{
|
{
|
||||||
TShock.ProjectileBans.RemoveGroup(id, 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));
|
args.Player.SendSuccessMessage(String.Format("{0} has been disallowed from using projectile {1}.",
|
||||||
|
args.Parameters[2], id));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
args.Player.SendWarningMessage(String.Format("{0} is already prevented from using projectile {1}.", args.Parameters[2], id));
|
args.Player.SendWarningMessage(String.Format("{0} is already prevented from using projectile {1}.",
|
||||||
|
args.Parameters[2], id));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -2922,7 +2939,9 @@ namespace TShockAPI
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
return;
|
return;
|
||||||
case "help":
|
case "help":
|
||||||
args.Player.SendInfoMessage("Syntax: /projban <command> [arguments]");
|
args.Player.SendInfoMessage("Syntax: /projban <command> [arguments]");
|
||||||
|
|
@ -2931,7 +2950,9 @@ namespace TShockAPI
|
||||||
args.Player.SendInfoMessage("Arguments: del <id>, disallow <id> <group name>, list [page]");
|
args.Player.SendInfoMessage("Arguments: del <id>, disallow <id> <group name>, list [page]");
|
||||||
return;
|
return;
|
||||||
case "list":
|
case "list":
|
||||||
|
|
||||||
#region List items
|
#region List items
|
||||||
|
|
||||||
int pageNumber;
|
int pageNumber;
|
||||||
if (!PaginationTools.TryParsePageNumber(args.Parameters, 1, args.Player, out pageNumber))
|
if (!PaginationTools.TryParsePageNumber(args.Parameters, 1, args.Player, out pageNumber))
|
||||||
return;
|
return;
|
||||||
|
|
@ -2944,7 +2965,9 @@ namespace TShockAPI
|
||||||
FooterFormat = "Type /Projectile list {0} for more.",
|
FooterFormat = "Type /Projectile list {0} for more.",
|
||||||
NothingToDisplayString = "There are currently no banned projectiles."
|
NothingToDisplayString = "There are currently no banned projectiles."
|
||||||
});
|
});
|
||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -34,12 +34,12 @@ namespace TShockAPI.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();
|
||||||
|
|
@ -53,7 +53,7 @@ namespace TShockAPI.DB
|
||||||
{
|
{
|
||||||
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);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -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);
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue