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

Undo plugin-breaking changes

Browse source
This commit is contained in:
MarioE 2013-12-15 18:50:44 -05:00
parent 51a593f274
commit 766b077e99
4 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
TShockAPI/Commands.cs
View file

@ -2008,7 +2008,7 @@ namespace TShockAPI
foreach (TSPlayer tsplr in TShock.Players) foreach (TSPlayer tsplr in TShock.Players)
{ {
if (tsplr != null && tsplr.IsRaptor && tsplr.Group.HasPermission(Permissions.managewarp)) if (tsplr != null && tsplr.IsRaptor && tsplr.Group.HasPermission(Permissions.managewarp))
tsplr.SendRaptorWarp(TShock.Warps.Find(warpName)); tsplr.SendRaptorWarp(TShock.Warps.FindWarp(warpName));
} }
} }
else else
@ -2090,7 +2090,7 @@ namespace TShockAPI
} }
string warpName = args.Parameters[2]; string warpName = args.Parameters[2];
var warp = TShock.Warps.Find(warpName); var warp = TShock.Warps.FindWarp(warpName);
var plr = foundplr[0]; var plr = foundplr[0];
if (warp.Position != Point.Zero) if (warp.Position != Point.Zero)
{ {
@ -2109,7 +2109,7 @@ namespace TShockAPI
else else
{ {
string warpName = String.Join(" ", args.Parameters); string warpName = String.Join(" ", args.Parameters);
var warp = TShock.Warps.Find(warpName); var warp = TShock.Warps.FindWarp(warpName);
if (warp != null) if (warp != null)
{ {
if (args.Player.Teleport(warp.Position.X * 16, warp.Position.Y * 16)) if (args.Player.Teleport(warp.Position.X * 16, warp.Position.Y * 16))

2
TShockAPI/DB/WarpsManager.cs
View file

@ -126,7 +126,7 @@ namespace TShockAPI.DB
/// </summary> /// </summary>
/// <param name="warpName">The name.</param> /// <param name="warpName">The name.</param>
/// <returns>The warp, if it exists, or else null.</returns> /// <returns>The warp, if it exists, or else null.</returns>
public Warp Find(string warpName) public Warp FindWarp(string warpName)
{ {
return Warps.FirstOrDefault(w => String.Equals(w.Name, warpName, StringComparison.OrdinalIgnoreCase)); return Warps.FirstOrDefault(w => String.Equals(w.Name, warpName, StringComparison.OrdinalIgnoreCase));
} }

4
TShockAPI/GetDataHandlers.cs
View file

@ -3481,14 +3481,14 @@ namespace TShockAPI
int y = args.Data.ReadInt32(); int y = args.Data.ReadInt32();
string warpName = args.Data.ReadString(); string warpName = args.Data.ReadString();
Warp warp = TShock.Warps.Find(warpName); Warp warp = TShock.Warps.FindWarp(warpName);
if (warp == null) if (warp == null)
{ {
TShock.Warps.Add(x, y, warpName); TShock.Warps.Add(x, y, warpName);
foreach (TSPlayer tsplr in TShock.Players) foreach (TSPlayer tsplr in TShock.Players)
{ {
if (tsplr != null && tsplr.IsRaptor && tsplr.Group.HasPermission(Permissions.managewarp) && tsplr != args.Player) if (tsplr != null && tsplr.IsRaptor && tsplr.Group.HasPermission(Permissions.managewarp) && tsplr != args.Player)
tsplr.SendRaptorWarp(TShock.Warps.Find(warpName)); tsplr.SendRaptorWarp(TShock.Warps.FindWarp(warpName));
} }
Log.Info("{0} added warp \"{1}\".", args.Player.UserAccountName, warpName); Log.Info("{0} added warp \"{1}\".", args.Player.UserAccountName, warpName);
} }

2
TShockAPI/TSPlayer.cs
View file

@ -458,6 +458,8 @@ namespace TShockAPI
get { return (int) (Y/16); } get { return (int) (Y/16); }
} }
public bool TpLock;
public bool InventorySlotAvailable public bool InventorySlotAvailable
{ {
get get