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

Move TShock.CheckIgnores(TSPlayer) -> TSPlayer.CheckIgnores()

Browse source 
Note: This method really sucks and needs to be rebuilt anyway.
This commit is contained in:
Lucas Nicodemus 2017-12-16 01:03:05 -07:00
parent 9f7c3ead09
commit 1bee289daf
3 changed files with 30 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

40
TShockAPI/Bouncer.cs
View file

@ -69,7 +69,7 @@ namespace TShockAPI
/// <param name="args">The packet arguments that the event has.</param> /// <param name="args">The packet arguments that the event has.</param>
internal void OnPlaceItemFrame(object sender, GetDataHandlers.PlaceItemFrameEventArgs args) internal void OnPlaceItemFrame(object sender, GetDataHandlers.PlaceItemFrameEventArgs args)
{ {
if (TShock.CheckIgnores(args.Player)) if (args.Player.CheckIgnores())
{ {
NetMessage.SendData((int)PacketTypes.UpdateTileEntity, -1, -1, NetworkText.Empty, args.ItemFrame.ID, 0, 1); NetMessage.SendData((int)PacketTypes.UpdateTileEntity, -1, -1, NetworkText.Empty, args.ItemFrame.ID, 0, 1);
args.Handled = true; args.Handled = true;
@ -108,7 +108,7 @@ namespace TShockAPI
return; return;
} }
if (TShock.CheckIgnores(args.Player)) if (args.Player.CheckIgnores())
{ {
args.Handled = true; args.Handled = true;
return; return;
@ -126,7 +126,7 @@ namespace TShockAPI
/// <param name="args">The packet arguments that the event has.</param> /// <param name="args">The packet arguments that the event has.</param>
internal void OnPlaceTileEntity(object sender, GetDataHandlers.PlaceTileEntityEventArgs args) internal void OnPlaceTileEntity(object sender, GetDataHandlers.PlaceTileEntityEventArgs args)
{ {
if (TShock.CheckIgnores(args.Player)) if (args.Player.CheckIgnores())
{ {
args.Handled = true; args.Handled = true;
return; return;
@ -177,7 +177,7 @@ namespace TShockAPI
return; return;
} }
if (TShock.CheckIgnores(args.Player)) if (args.Player.CheckIgnores())
{ {
args.Handled = true; args.Handled = true;
return; return;
@ -196,7 +196,7 @@ namespace TShockAPI
/// <param name="args">args</param> /// <param name="args">args</param>
internal void OnPlayerAnimation(object sender, GetDataHandlers.PlayerAnimationEventArgs args) internal void OnPlayerAnimation(object sender, GetDataHandlers.PlayerAnimationEventArgs args)
{ {
if (TShock.CheckIgnores(args.Player)) if (args.Player.CheckIgnores())
{ {
args.Player.SendData(PacketTypes.PlayerAnimation, "", args.Player.Index); args.Player.SendData(PacketTypes.PlayerAnimation, "", args.Player.Index);
args.Handled = true; args.Handled = true;
@ -245,7 +245,7 @@ namespace TShockAPI
return; return;
} }
if (TShock.CheckIgnores(args.Player)) if (args.Player.CheckIgnores())
{ {
args.Player.SendData(PacketTypes.NpcUpdate, "", id); args.Player.SendData(PacketTypes.NpcUpdate, "", id);
args.Handled = true; args.Handled = true;
@ -311,7 +311,7 @@ namespace TShockAPI
return; return;
} }
if (TShock.CheckIgnores(args.Player)) if (args.Player.CheckIgnores())
{ {
args.Player.SendData(PacketTypes.PlayerHp, "", id); args.Player.SendData(PacketTypes.PlayerHp, "", id);
args.Player.SendData(PacketTypes.PlayerUpdate, "", id); args.Player.SendData(PacketTypes.PlayerUpdate, "", id);
@ -419,7 +419,7 @@ namespace TShockAPI
} }
if (TShock.CheckIgnores(args.Player)) if (args.Player.CheckIgnores())
{ {
args.Player.SendData(PacketTypes.ItemDrop, "", id); args.Player.SendData(PacketTypes.ItemDrop, "", id);
args.Handled = true; args.Handled = true;
@ -442,7 +442,7 @@ namespace TShockAPI
return; return;
} }
if (TShock.CheckIgnores(args.Player)) if (args.Player.CheckIgnores())
{ {
args.Player.SendData(PacketTypes.PlayerAddBuff, "", id); args.Player.SendData(PacketTypes.PlayerAddBuff, "", id);
args.Handled = true; args.Handled = true;
@ -501,7 +501,7 @@ namespace TShockAPI
return; return;
} }
if (TShock.CheckIgnores(args.Player)) if (args.Player.CheckIgnores())
{ {
args.Player.SendData(PacketTypes.ChestItem, "", id, slot); args.Player.SendData(PacketTypes.ChestItem, "", id, slot);
args.Handled = true; args.Handled = true;
@ -556,7 +556,7 @@ namespace TShockAPI
/// <param name="args">The packet arguments that the event has.</param> /// <param name="args">The packet arguments that the event has.</param>
internal void OnChestOpen(object sender, GetDataHandlers.ChestOpenEventArgs args) internal void OnChestOpen(object sender, GetDataHandlers.ChestOpenEventArgs args)
{ {
if (TShock.CheckIgnores(args.Player)) if (args.Player.CheckIgnores())
{ {
args.Handled = true; args.Handled = true;
return; return;
@ -593,7 +593,7 @@ namespace TShockAPI
return; return;
} }
if (TShock.CheckIgnores(args.Player)) if (args.Player.CheckIgnores())
{ {
args.Player.SendTileSquare(tileX, tileY, 3); args.Player.SendTileSquare(tileX, tileY, 3);
args.Handled = true; args.Handled = true;
@ -654,7 +654,7 @@ namespace TShockAPI
return; return;
} }
if (TShock.CheckIgnores(args.Player)) if (args.Player.CheckIgnores())
{ {
args.Player.SendTileSquare(tileX, tileY, 1); args.Player.SendTileSquare(tileX, tileY, 1);
args.Handled = true; args.Handled = true;
@ -789,7 +789,7 @@ namespace TShockAPI
return; return;
} }
if (TShock.CheckIgnores(args.Player)) if (args.Player.CheckIgnores())
{ {
args.Player.RemoveProjectile(args.ProjectileIdentity, args.ProjectileOwner); args.Player.RemoveProjectile(args.ProjectileIdentity, args.ProjectileOwner);
args.Handled = true; args.Handled = true;
@ -839,7 +839,7 @@ namespace TShockAPI
float distance = Vector2.Distance(new Vector2(pos.X / 16f, pos.Y / 16f), float distance = Vector2.Distance(new Vector2(pos.X / 16f, pos.Y / 16f),
new Vector2(args.Player.LastNetPosition.X / 16f, args.Player.LastNetPosition.Y / 16f)); new Vector2(args.Player.LastNetPosition.X / 16f, args.Player.LastNetPosition.Y / 16f));
if (TShock.CheckIgnores(args.Player)) if (args.Player.CheckIgnores())
{ {
// If the player has moved outside the disabled zone... // If the player has moved outside the disabled zone...
if (distance > TShock.Config.MaxRangeForDisabled) if (distance > TShock.Config.MaxRangeForDisabled)
@ -980,7 +980,7 @@ namespace TShockAPI
return; return;
} }
if (TShock.CheckIgnores(args.Player)) if (args.Player.CheckIgnores())
{ {
args.Player.RemoveProjectile(ident, owner); args.Player.RemoveProjectile(ident, owner);
args.Handled = true; args.Handled = true;
@ -1113,7 +1113,7 @@ namespace TShockAPI
return; return;
} }
if (TShock.CheckIgnores(args.Player)) if (args.Player.CheckIgnores())
{ {
args.Player.SendTileSquare(x, y, 4); args.Player.SendTileSquare(x, y, 4);
args.Handled = true; args.Handled = true;
@ -1467,7 +1467,7 @@ namespace TShockAPI
return; return;
} }
if (TShock.CheckIgnores(args.Player)) if (args.Player.CheckIgnores())
{ {
args.Player.SendTileSquare(tileX, tileY, 4); args.Player.SendTileSquare(tileX, tileY, 4);
args.Handled = true; args.Handled = true;
@ -1583,7 +1583,7 @@ namespace TShockAPI
return; return;
} }
if (TShock.CheckIgnores(args.Player) || (DateTime.UtcNow - args.Player.LastThreat).TotalMilliseconds < 5000) if (args.Player.CheckIgnores() || (DateTime.UtcNow - args.Player.LastThreat).TotalMilliseconds < 5000)
{ {
args.Handled = true; args.Handled = true;
return; return;
@ -1624,7 +1624,7 @@ namespace TShockAPI
return; return;
} }
if (TShock.CheckIgnores(args.Player)) if (args.Player.CheckIgnores())
{ {
args.Player.SendTileSquare(tileX, tileY, size); args.Player.SendTileSquare(tileX, tileY, size);
args.Handled = true; args.Handled = true;

8
TShockAPI/TSPlayer.cs
View file

@ -285,6 +285,14 @@ namespace TShockAPI
public bool IgnoreActionsForClearingTrashCan; public bool IgnoreActionsForClearingTrashCan;
/// <summary>CheckIgnores - Checks a players ignores...?</summary>
/// <param name="player">player - The TSPlayer object.</param>
/// <returns>bool - True if any ignore is not none, false, or login state differs from the required state.</returns>
public bool CheckIgnores()
{
return IgnoreActionsForInventory != "none" || IgnoreActionsForCheating != "none" || IgnoreActionsForDisabledArmor != "none" || IgnoreActionsForClearingTrashCan || !IsLoggedIn && TShock.Config.RequireLogin;
}
/// <summary> /// <summary>
/// The player's server side inventory data. /// The player's server side inventory data.
/// </summary> /// </summary>

12
TShockAPI/TShock.cs
View file

@ -1080,7 +1080,7 @@ namespace TShockAPI
if (Main.ServerSideCharacter && !player.IsLoggedIn) if (Main.ServerSideCharacter && !player.IsLoggedIn)
{ {
if (CheckIgnores(player)) if (player.CheckIgnores())
{ {
player.Disable(flags: flags); player.Disable(flags: flags);
} }
@ -1160,7 +1160,7 @@ namespace TShockAPI
} }
player.IgnoreActionsForDisabledArmor = check; player.IgnoreActionsForDisabledArmor = check;
if (CheckIgnores(player)) if (player.CheckIgnores())
{ {
player.Disable(flags: flags); player.Disable(flags: flags);
} }
@ -2142,14 +2142,6 @@ namespace TShockAPI
return check; return check;
} }
/// <summary>CheckIgnores - Checks a players ignores...?</summary>
/// <param name="player">player - The TSPlayer object.</param>
/// <returns>bool - True if any ignore is not none, false, or login state differs from the required state.</returns>
public static bool CheckIgnores(TSPlayer player)
{
return player.IgnoreActionsForInventory != "none" || player.IgnoreActionsForCheating != "none" || player.IgnoreActionsForDisabledArmor != "none" || player.IgnoreActionsForClearingTrashCan || !player.IsLoggedIn && Config.RequireLogin;
}
/// <summary>OnConfigRead - Fired when the config file has been read.</summary> /// <summary>OnConfigRead - Fired when the config file has been read.</summary>
/// <param name="file">file - The config file object.</param> /// <param name="file">file - The config file object.</param>
public void OnConfigRead(ConfigFile file) public void OnConfigRead(ConfigFile file)