diff --git a/TShockAPI/Commands.cs b/TShockAPI/Commands.cs
index 3b07ca75..5e7b84bf 100644
--- a/TShockAPI/Commands.cs
+++ b/TShockAPI/Commands.cs
@@ -5297,7 +5297,7 @@ namespace TShockAPI
if (itemAmount == 0 || itemAmount > item.maxStack)
itemAmount = item.maxStack;
- if (args.Player.GiveItemCheck(item.type, EnglishLanguage.GetItemNameById(item.type), item.width, item.height, itemAmount, prefixId))
+ if (args.Player.GiveItemCheck(item.type, EnglishLanguage.GetItemNameById(item.type), itemAmount, prefixId))
{
item.prefix = (byte)prefixId;
args.Player.SendSuccessMessage("Gave {0} {1}(s).", itemAmount, item.AffixName());
@@ -5436,7 +5436,7 @@ namespace TShockAPI
{
if (itemAmount == 0 || itemAmount > item.maxStack)
itemAmount = item.maxStack;
- if (plr.GiveItemCheck(item.type, EnglishLanguage.GetItemNameById(item.type), item.width, item.height, itemAmount, prefix))
+ if (plr.GiveItemCheck(item.type, EnglishLanguage.GetItemNameById(item.type), itemAmount, prefix))
{
args.Player.SendSuccessMessage(string.Format("Gave {0} {1} {2}(s).", plr.Name, itemAmount, item.Name));
plr.SendSuccessMessage(string.Format("{0} gave you {1} {2}(s).", args.Player.Name, itemAmount, item.Name));
diff --git a/TShockAPI/TSPlayer.cs b/TShockAPI/TSPlayer.cs
index 42d1b157..8d0819bf 100644
--- a/TShockAPI/TSPlayer.cs
+++ b/TShockAPI/TSPlayer.cs
@@ -375,7 +375,7 @@ namespace TShockAPI
get
{
return RealPlayer
- && (Netplay.Clients[Index] != null && Netplay.Clients[Index].IsActive && !Netplay.Clients[Index].PendingTermination);
+ && (Netplay.Clients[Index] != null && Netplay.Clients[Index].IsActive && !Netplay.Clients[Index].PendingTermination);
}
}
@@ -413,10 +413,10 @@ namespace TShockAPI
{
if (string.IsNullOrEmpty(CacheIP))
return
- CacheIP = RealPlayer ? (Netplay.Clients[Index].Socket.IsConnected()
- ? TShock.Utils.GetRealIP(Netplay.Clients[Index].Socket.GetRemoteAddress().ToString())
- : "")
- : "";
+ CacheIP = RealPlayer ? (Netplay.Clients[Index].Socket.IsConnected()
+ ? TShock.Utils.GetRealIP(Netplay.Clients[Index].Socket.GetRemoteAddress().ToString())
+ : "")
+ : "";
else
return CacheIP;
}
@@ -522,7 +522,7 @@ namespace TShockAPI
///
public float X
{
- get { return RealPlayer ? TPlayer.position.X : Main.spawnTileX*16; }
+ get { return RealPlayer ? TPlayer.position.X : Main.spawnTileX * 16; }
}
///
@@ -530,7 +530,7 @@ namespace TShockAPI
///
public float Y
{
- get { return RealPlayer ? TPlayer.position.Y : Main.spawnTileY*16; }
+ get { return RealPlayer ? TPlayer.position.Y : Main.spawnTileY * 16; }
}
///
@@ -538,7 +538,7 @@ namespace TShockAPI
///
public int TileX
{
- get { return (int) (X/16); }
+ get { return (int)(X / 16); }
}
///
@@ -546,7 +546,7 @@ namespace TShockAPI
///
public int TileY
{
- get { return (int) (Y/16); }
+ get { return (int)(Y / 16); }
}
///
@@ -688,7 +688,7 @@ namespace TShockAPI
TilesDestroyed = new Dictionary();
TilesCreated = new Dictionary();
Index = -1;
- FakePlayer = new Player {name = playerName, whoAmI = -1};
+ FakePlayer = new Player { name = playerName, whoAmI = -1 };
Group = Group.DefaultGroup;
AwaitingResponse = new Dictionary>();
}
@@ -744,7 +744,7 @@ namespace TShockAPI
y = 992;
}
- SendTileSquare((int) (x/16), (int) (y/16), 15);
+ SendTileSquare((int)(x / 16), (int)(y / 16), 15);
TPlayer.Teleport(new Vector2(x, y), style);
NetMessage.SendData((int)PacketTypes.Teleport, -1, -1, NetworkText.Empty, 0, TPlayer.whoAmI, x, y, style);
return true;
@@ -784,11 +784,11 @@ namespace TShockAPI
using (var ms = new MemoryStream())
{
var msg = new SpawnMsg
- {
- PlayerIndex = (byte) Index,
- TileX = (short)tilex,
- TileY = (short)tiley
- };
+ {
+ PlayerIndex = (byte)Index,
+ TileX = (short)tilex,
+ TileY = (short)tiley
+ };
msg.PackFull(ms);
SendRawData(ms.ToArray());
}
@@ -804,10 +804,10 @@ namespace TShockAPI
using (var ms = new MemoryStream())
{
var msg = new ProjectileRemoveMsg
- {
- Index = (short) index,
- Owner = (byte) owner
- };
+ {
+ Index = (short)index,
+ Owner = (byte)owner
+ };
msg.PackFull(ms);
SendRawData(ms.ToArray());
}
@@ -817,7 +817,7 @@ namespace TShockAPI
{
try
{
- int num = (size - 1)/2;
+ int num = (size - 1) / 2;
int m_x = 0;
int m_y = 0;
@@ -866,18 +866,37 @@ namespace TShockAPI
///
/// Gives an item to the player. Includes banned item spawn prevention to check if the player can spawn the item.
///
- ///
- ///
- ///
- ///
- ///
- ///
+ /// The item ID.
+ /// The item name.
+ /// The item stack.
+ /// The item prefix.
/// True or false, depending if the item passed the check or not.
+ public bool GiveItemCheck(int type, string name, int stack, int prefix = 0)
+ {
+ if ((TShock.Itembans.ItemIsBanned(name) && TShock.Config.PreventBannedItemSpawn) &&
+ (TShock.Itembans.ItemIsBanned(name, this) || !TShock.Config.AllowAllowedGroupsToSpawnBannedItems))
+ return false;
+
+ GiveItem(type, stack, prefix);
+ return true;
+ }
+
+ ///
+ /// Gives an item to the player. Includes banned item spawn prevention to check if the player can spawn the item.
+ ///
+ /// The item ID.
+ /// The item name.
+ /// The width of the receiver.
+ /// The height of the receiver.
+ /// The item stack.
+ /// The item prefix.
+ /// True or false, depending if the item passed the check or not.
+ [Obsolete("Use the GiveItemCheck overload with fewer parameters.")]
public bool GiveItemCheck(int type, string name, int width, int height, int stack, int prefix = 0)
{
if ((TShock.Itembans.ItemIsBanned(name) && TShock.Config.PreventBannedItemSpawn) &&
- (TShock.Itembans.ItemIsBanned(name, this) || !TShock.Config.AllowAllowedGroupsToSpawnBannedItems))
- return false;
+ (TShock.Itembans.ItemIsBanned(name, this) || !TShock.Config.AllowAllowedGroupsToSpawnBannedItems))
+ return false;
GiveItem(type, name, width, height, stack, prefix);
return true;
@@ -886,28 +905,29 @@ namespace TShockAPI
///
/// Gives an item to the player.
///
- /// The item's netID.
- /// The tiem's name.
- /// The item's width.
- /// The item's height.
- /// The item's stack.
- /// The item's prefix.
+ /// The item ID.
+ /// The item stack.
+ /// The item prefix.
+ public virtual void GiveItem(int type, int stack, int prefix = 0)
+ {
+ int itemIndex = Item.NewItem((int)X, (int)Y, TPlayer.width, TPlayer.height, type, stack, true, prefix, true);
+ SendData(PacketTypes.ItemDrop, "", itemIndex);
+ }
+
+ ///
+ /// Gives an item to the player.
+ ///
+ /// The item ID.
+ /// The item name. This parameter is unused.
+ /// The width of the receiver.
+ /// The height of the receiver.
+ /// The item stack.
+ /// The item prefix.
+ [Obsolete("Use the GiveItem overload with fewer parameters.")]
public virtual void GiveItem(int type, string name, int width, int height, int stack, int prefix = 0)
{
- int itemid = Item.NewItem((int) X, (int) Y, width, height, type, stack, true, prefix, true);
-
- // This is for special pickaxe/hammers/swords etc
- Main.item[itemid].netDefaults(type);
- // The set default overrides the wet and stack set by NewItem
- Main.item[itemid].wet = Collision.WetCollision(Main.item[itemid].position, Main.item[itemid].width,
- Main.item[itemid].height);
- Main.item[itemid].stack = stack;
- Main.item[itemid].owner = Index;
- Main.item[itemid].prefix = (byte) prefix;
- Main.item[itemid].noGrabDelay = 1;
- Main.item[itemid].velocity = Main.player[this.Index].velocity;
- NetMessage.SendData((int)PacketTypes.ItemDrop, -1, -1, NetworkText.Empty, itemid, 0f, 0f, 0f);
- NetMessage.SendData((int)PacketTypes.ItemOwner, -1, -1, NetworkText.Empty, itemid, 0f, 0f, 0f);
+ int itemIndex = Item.NewItem((int)X, (int)Y, width, height, type, stack, true, prefix, true);
+ SendData(PacketTypes.ItemDrop, "", itemIndex);
}
///
@@ -1144,7 +1164,7 @@ namespace TShockAPI
/// The
public virtual void Whoopie(object time)
{
- var time2 = (int) time;
+ var time2 = (int)time;
var launch = DateTime.UtcNow;
var startname = Name;
SendInfoMessage("You are now being annoyed.");
@@ -1186,7 +1206,7 @@ namespace TShockAPI
if (RealPlayer && !ConnectionAlive)
return;
- NetMessage.SendData((int) msgType, Index, -1, NetworkText.FromLiteral(text), number, number2, number3, number4, number5);
+ NetMessage.SendData((int)msgType, Index, -1, NetworkText.FromLiteral(text), number, number2, number3, number4, number5);
}
///
@@ -1205,7 +1225,7 @@ namespace TShockAPI
if (RealPlayer && !ConnectionAlive)
return;
- NetMessage.SendData((int) msgType, Index, -1, NetworkText.FromFormattable(text), ply, number2, number3, number4, number5);
+ NetMessage.SendData((int)msgType, Index, -1, NetworkText.FromFormattable(text), ply, number2, number3, number4, number5);
}
///
@@ -1225,9 +1245,9 @@ namespace TShockAPI
///
/// The string representing the command i.e "yes" == /yes
/// The method that will be executed on confirmation ie user accepts
- public void AddResponse( string name, Action