From 597322217d0de6d80728d796c9df8cbea0d7f51e Mon Sep 17 00:00:00 2001 From: Enerdy Date: Sat, 4 Jul 2015 16:17:31 +0100 Subject: [PATCH] Fix more broken calls. --- TShockAPI/Commands.cs | 52 +++++++++++++++++------------------ TShockAPI/GetDataHandlers.cs | 12 ++++---- TShockAPI/Rest/RestManager.cs | 2 +- TShockAPI/StatTracker.cs | 2 +- 4 files changed, 34 insertions(+), 34 deletions(-) diff --git a/TShockAPI/Commands.cs b/TShockAPI/Commands.cs index 2c00e43b..72ca87d2 100755 --- a/TShockAPI/Commands.cs +++ b/TShockAPI/Commands.cs @@ -1619,7 +1619,7 @@ namespace TShockAPI private static void ForceXmas(CommandArgs args) { TShock.Config.ForceXmas = !TShock.Config.ForceXmas; - Main.checkXMas(); + Main.CheckXMas(); if (args.Silent) args.Player.SendInfoMessage("{0}abled Christmas mode!", (TShock.Config.ForceXmas ? "en" : "dis")); else @@ -1627,31 +1627,31 @@ namespace TShockAPI } private static void TempGroup(CommandArgs args) - { - if (args.Parameters.Count < 2) - { - args.Player.SendInfoMessage("Invalid usage"); - args.Player.SendInfoMessage("Usage: {0}tempgroup [time]", Specifier); - return; - } + { + if (args.Parameters.Count < 2) + { + args.Player.SendInfoMessage("Invalid usage"); + args.Player.SendInfoMessage("Usage: {0}tempgroup [time]", Specifier); + return; + } - List ply = TShock.Utils.FindPlayer(args.Parameters[0]); - if(ply.Count < 1) - { - args.Player.SendErrorMessage("Could not find player {0}.", args.Parameters[0]); - return; - } + List ply = TShock.Utils.FindPlayer(args.Parameters[0]); + if (ply.Count < 1) + { + args.Player.SendErrorMessage("Could not find player {0}.", args.Parameters[0]); + return; + } - if (ply.Count > 1) - { + if (ply.Count > 1) + { TShock.Utils.SendMultipleMatchError(args.Player, ply.Select(p => p.User.Name)); - } + } - if(!TShock.Groups.GroupExists(args.Parameters[1])) - { - args.Player.SendErrorMessage("Could not find group {0}", args.Parameters[1]); - return; - } + if (!TShock.Groups.GroupExists(args.Parameters[1])) + { + args.Player.SendErrorMessage("Could not find group {0}", args.Parameters[1]); + return; + } if (args.Parameters.Count > 2) { @@ -1663,14 +1663,14 @@ namespace TShockAPI return; } - ply[0].tempGroupTimer = new System.Timers.Timer(time*1000); + ply[0].tempGroupTimer = new System.Timers.Timer(time * 1000); ply[0].tempGroupTimer.Elapsed += ply[0].TempGroupTimerElapsed; ply[0].tempGroupTimer.Start(); } - Group g = TShock.Utils.GetGroup(args.Parameters[1]); + Group g = TShock.Utils.GetGroup(args.Parameters[1]); - ply[0].tempGroup = g; + ply[0].tempGroup = g; if (args.Parameters.Count < 3) { @@ -1684,7 +1684,7 @@ namespace TShockAPI ply[0].SendSuccessMessage(String.Format("Your group has been changed to {0} for {1}", g.Name, args.Parameters[2])); } - } + } #endregion Player Management Commands diff --git a/TShockAPI/GetDataHandlers.cs b/TShockAPI/GetDataHandlers.cs index a461be0b..3431edf6 100755 --- a/TShockAPI/GetDataHandlers.cs +++ b/TShockAPI/GetDataHandlers.cs @@ -1914,19 +1914,19 @@ namespace TShockAPI if (action == EditAction.KillTile && !Main.tileCut[tile.type] && !breakableTiles.Contains(tile.type)) { // If the tile is an axe tile and they aren't selecting an axe, they're hacking. - if (Main.tileAxe[tile.type] && (selectedItem.axe == 0 && selectedItem.explosive == 0 && args.Player.RecentFuse == 0)) + if (Main.tileAxe[tile.type] && (selectedItem.axe == 0 && !ItemID.Sets.Explosives[selectedItem.netID] && args.Player.RecentFuse == 0)) { args.Player.SendTileSquare(tileX, tileY, 4); return true; } // If the tile is a hammer tile and they aren't selecting an hammer, they're hacking. - else if (Main.tileHammer[tile.type] && (selectedItem.hammer == 0 && selectedItem.explosive == 0 && args.Player.RecentFuse == 0)) + else if (Main.tileHammer[tile.type] && (selectedItem.hammer == 0 && !ItemID.Sets.Explosives[selectedItem.netID] && args.Player.RecentFuse == 0)) { args.Player.SendTileSquare(tileX, tileY, 4); return true; } // If the tile is a pickaxe tile and they aren't selecting a pickaxe, they're hacking. - else if ((!Main.tileAxe[tile.type] && !Main.tileHammer[tile.type]) && tile.wall == 0 && (selectedItem.pick == 0 && selectedItem.explosive == 0 && args.Player.RecentFuse == 0)) + else if ((!Main.tileAxe[tile.type] && !Main.tileHammer[tile.type]) && tile.wall == 0 && (selectedItem.pick == 0 && !ItemID.Sets.Explosives[selectedItem.netID] && args.Player.RecentFuse == 0)) { args.Player.SendTileSquare(tileX, tileY, 4); return true; @@ -1935,7 +1935,7 @@ namespace TShockAPI else if (action == EditAction.KillWall) { // If they aren't selecting an hammer, they're hacking. - if (selectedItem.hammer == 0 && selectedItem.explosive == 0 && args.Player.RecentFuse == 0) + if (selectedItem.hammer == 0 && !ItemID.Sets.Explosives[selectedItem.netID] && args.Player.RecentFuse == 0) { args.Player.SendTileSquare(tileX, tileY, 1); return true; @@ -2396,7 +2396,7 @@ namespace TShockAPI } - args.TPlayer.UpdatePlayer(args.TPlayer.whoAmi); + args.TPlayer.Update(args.TPlayer.whoAmI); NetMessage.SendData((int)PacketTypes.PlayerUpdate, -1, -1, "", args.Player.Index); return true; } @@ -2594,7 +2594,7 @@ namespace TShockAPI foreach (NPC npc in Main.npc) { if (npc.active && (npc.boss || npc.type == 13 || npc.type == 14 || npc.type == 15) && - Math.Abs(args.TPlayer.center().X - npc.center().X) + Math.Abs(args.TPlayer.center().Y - npc.center().Y) < 4000f) + Math.Abs(args.TPlayer.Center.X - npc.Center.X) + Math.Abs(args.TPlayer.Center.Y - npc.Center.Y) < 4000f) { args.Player.RespawnTimer = TShock.Config.RespawnBossSeconds; break; diff --git a/TShockAPI/Rest/RestManager.cs b/TShockAPI/Rest/RestManager.cs index 18643649..7c3056e4 100644 --- a/TShockAPI/Rest/RestManager.cs +++ b/TShockAPI/Rest/RestManager.cs @@ -314,7 +314,7 @@ namespace TShockAPI return new RestObject() { {"name", TShock.Config.ServerName}, - {"port", Convert.ToString(Netplay.serverPort)}, + {"port", Convert.ToString(Netplay.ListenPort)}, {"playercount", Convert.ToString(activeplayers.Count())}, {"players", string.Join(", ", activeplayers.Select(p => p.name))}, }; diff --git a/TShockAPI/StatTracker.cs b/TShockAPI/StatTracker.cs index 3850f48c..c589f0b3 100755 --- a/TShockAPI/StatTracker.cs +++ b/TShockAPI/StatTracker.cs @@ -33,7 +33,7 @@ namespace TShockAPI Thread.Sleep(1000*60*15); var data = new JsonData { - port = Terraria.Netplay.serverPort, + port = Terraria.Netplay.ListenPort, currentPlayers = TShock.Utils.ActivePlayers(), maxPlayers = TShock.Config.MaxSlots, systemRam = 0,