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

19
TShockAPI/TShock.cs
View file

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