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

Re-do warps

Browse source
This commit is contained in:
MarioE 2013-11-01 23:55:31 -04:00
parent 416ce98518
commit 41121b8412
5 changed files with 125 additions and 135 deletions
Download patch file Download diff file Expand all files Collapse all files

10
TShockAPI/GetDataHandlers.cs
View file

@ -3454,14 +3454,14 @@ namespace TShockAPI
bool isHidden = args.Data.ReadBoolean();
string warpName = args.Data.ReadString();
Warp warp = TShock.Warps.FindWarp(warpName);
if (warp.WarpPos == Vector2.Zero)
Warp warp = TShock.Warps.Find(warpName);
if (warp == null)
{
TShock.Warps.AddWarp(x, y, warpName, Main.worldID.ToString());
TShock.Warps.Add(x, y, warpName);
foreach (TSPlayer tsplr in TShock.Players)
{
if (tsplr != null && tsplr.IsRaptor && tsplr.Group.HasPermission(Permissions.managewarp) && tsplr != args.Player)
tsplr.SendRaptorWarp(TShock.Warps.FindWarp(warpName));
tsplr.SendRaptorWarp(TShock.Warps.Find(warpName));
}
Log.Info("{0} added warp \"{1}\".", args.Player.UserAccountName, warpName);
}
@ -3481,7 +3481,7 @@ namespace TShockAPI
if (args.Player.Group.HasPermission(Permissions.managewarp))
{
string warpName = args.Data.ReadString();
TShock.Warps.RemoveWarp(warpName);
TShock.Warps.Remove(warpName);
foreach (TSPlayer tsplr in TShock.Players)
{
if (tsplr != null && tsplr.IsRaptor && tsplr.Group.HasPermission(Permissions.managewarp) && tsplr != args.Player)