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

Fix more broken calls.

Browse source
This commit is contained in:
Enerdy 2015-07-04 16:17:31 +01:00
parent c79d2213e8
commit 597322217d
4 changed files with 34 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

52
TShockAPI/Commands.cs
View file

@ -1619,7 +1619,7 @@ namespace TShockAPI
private static void ForceXmas(CommandArgs args) private static void ForceXmas(CommandArgs args)
{ {
TShock.Config.ForceXmas = !TShock.Config.ForceXmas; TShock.Config.ForceXmas = !TShock.Config.ForceXmas;
Main.checkXMas(); Main.CheckXMas();
if (args.Silent) if (args.Silent)
args.Player.SendInfoMessage("{0}abled Christmas mode!", (TShock.Config.ForceXmas ? "en" : "dis")); args.Player.SendInfoMessage("{0}abled Christmas mode!", (TShock.Config.ForceXmas ? "en" : "dis"));
else else
@ -1627,31 +1627,31 @@ namespace TShockAPI
} }
private static void TempGroup(CommandArgs args) private static void TempGroup(CommandArgs args)
{ {
if (args.Parameters.Count < 2) if (args.Parameters.Count < 2)
{ {
args.Player.SendInfoMessage("Invalid usage"); args.Player.SendInfoMessage("Invalid usage");
args.Player.SendInfoMessage("Usage: {0}tempgroup <username> <new group> [time]", Specifier); args.Player.SendInfoMessage("Usage: {0}tempgroup <username> <new group> [time]", Specifier);
return; return;
} }
List<TSPlayer> ply = TShock.Utils.FindPlayer(args.Parameters[0]); List<TSPlayer> ply = TShock.Utils.FindPlayer(args.Parameters[0]);
if(ply.Count < 1) if (ply.Count < 1)
{ {
args.Player.SendErrorMessage("Could not find player {0}.", args.Parameters[0]); args.Player.SendErrorMessage("Could not find player {0}.", args.Parameters[0]);
return; return;
} }
if (ply.Count > 1) if (ply.Count > 1)
{ {
TShock.Utils.SendMultipleMatchError(args.Player, ply.Select(p => p.User.Name)); TShock.Utils.SendMultipleMatchError(args.Player, ply.Select(p => p.User.Name));
} }
if(!TShock.Groups.GroupExists(args.Parameters[1])) if (!TShock.Groups.GroupExists(args.Parameters[1]))
{ {
args.Player.SendErrorMessage("Could not find group {0}", args.Parameters[1]); args.Player.SendErrorMessage("Could not find group {0}", args.Parameters[1]);
return; return;
} }
if (args.Parameters.Count > 2) if (args.Parameters.Count > 2)
{ {
@ -1663,14 +1663,14 @@ namespace TShockAPI
return; 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.Elapsed += ply[0].TempGroupTimerElapsed;
ply[0].tempGroupTimer.Start(); 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) 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}", ply[0].SendSuccessMessage(String.Format("Your group has been changed to {0} for {1}",
g.Name, args.Parameters[2])); g.Name, args.Parameters[2]));
} }
} }
#endregion Player Management Commands #endregion Player Management Commands

12
TShockAPI/GetDataHandlers.cs
View file

@ -1914,19 +1914,19 @@ namespace TShockAPI
if (action == EditAction.KillTile && !Main.tileCut[tile.type] && !breakableTiles.Contains(tile.type)) 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 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); args.Player.SendTileSquare(tileX, tileY, 4);
return true; return true;
} }
// If the tile is a hammer tile and they aren't selecting an hammer, they're hacking. // 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); args.Player.SendTileSquare(tileX, tileY, 4);
return true; return true;
} }
// If the tile is a pickaxe tile and they aren't selecting a pickaxe, they're hacking. // 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); args.Player.SendTileSquare(tileX, tileY, 4);
return true; return true;
@ -1935,7 +1935,7 @@ namespace TShockAPI
else if (action == EditAction.KillWall) else if (action == EditAction.KillWall)
{ {
// If they aren't selecting an hammer, they're hacking. // 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); args.Player.SendTileSquare(tileX, tileY, 1);
return true; 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); NetMessage.SendData((int)PacketTypes.PlayerUpdate, -1, -1, "", args.Player.Index);
return true; return true;
} }
@ -2594,7 +2594,7 @@ namespace TShockAPI
foreach (NPC npc in Main.npc) foreach (NPC npc in Main.npc)
{ {
if (npc.active && (npc.boss || npc.type == 13 || npc.type == 14 || npc.type == 15) && 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; args.Player.RespawnTimer = TShock.Config.RespawnBossSeconds;
break; break;

2
TShockAPI/Rest/RestManager.cs
View file

@ -314,7 +314,7 @@ namespace TShockAPI
return new RestObject() return new RestObject()
{ {
{"name", TShock.Config.ServerName}, {"name", TShock.Config.ServerName},
{"port", Convert.ToString(Netplay.serverPort)}, {"port", Convert.ToString(Netplay.ListenPort)},
{"playercount", Convert.ToString(activeplayers.Count())}, {"playercount", Convert.ToString(activeplayers.Count())},
{"players", string.Join(", ", activeplayers.Select(p => p.name))}, {"players", string.Join(", ", activeplayers.Select(p => p.name))},
}; };

2
TShockAPI/StatTracker.cs
View file

@ -33,7 +33,7 @@ namespace TShockAPI
Thread.Sleep(1000*60*15); Thread.Sleep(1000*60*15);
var data = new JsonData var data = new JsonData
{ {
port = Terraria.Netplay.serverPort, port = Terraria.Netplay.ListenPort,
currentPlayers = TShock.Utils.ActivePlayers(), currentPlayers = TShock.Utils.ActivePlayers(),
maxPlayers = TShock.Config.MaxSlots, maxPlayers = TShock.Config.MaxSlots,
systemRam = 0, systemRam = 0,