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

Fixed /slap (now it goes both directions, but very small knockback)

Browse source 
Fixed issues with /spawnrate and /maxspawns where if the input string does not convert, it throws an exception.
This commit is contained in:
Deathmax 2011-06-02 23:43:25 +08:00
parent 17c6fa8e87
commit 49561497bd
1 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
TShockAPI/Commands.cs
View file

@ -365,14 +365,16 @@ namespace TShockAPI
public static void MaxSpawns(CommandArgs args) public static void MaxSpawns(CommandArgs args)
{ {
int ply = args.PlayerID; int ply = args.PlayerID;
int amount = Convert.ToInt32(args.Message.Remove(0, 10)); int amount = 4;//Convert.ToInt32(args.Message.Remove(0, 10));
int.TryParse(args.Message.Remove(0, 10), out amount);
NPC.maxSpawns = amount; NPC.maxSpawns = amount;
Tools.Broadcast(Tools.FindPlayer(ply) + " changed the maximum spawns to: " + amount); Tools.Broadcast(Tools.FindPlayer(ply) + " changed the maximum spawns to: " + amount);
} }
public static void SpawnRate(CommandArgs args) public static void SpawnRate(CommandArgs args)
{ {
int ply = args.PlayerID; int ply = args.PlayerID;
int amount = Convert.ToInt32(args.Message.Remove(0, 10)); int amount = 700;//Convert.ToInt32(args.Message.Remove(0, 10));
int.TryParse(args.Message.Remove(0, 10), out amount);
NPC.spawnRate = amount; NPC.spawnRate = amount;
Tools.Broadcast(Tools.FindPlayer(ply) + " changed the spawn rate to: " + amount); Tools.Broadcast(Tools.FindPlayer(ply) + " changed the spawn rate to: " + amount);
} }
@ -490,7 +492,7 @@ namespace TShockAPI
Tools.SendMessage(args.PlayerID, "Invalid player!", new float[] { 255f, 0f, 0f }); Tools.SendMessage(args.PlayerID, "Invalid player!", new float[] { 255f, 0f, 0f });
else else
{ {
TShock.SendDataAll(26, -1, "", player, (float)((new Random()).Next(1, 40)), (float)damage, (float)0); TShock.SendDataAll(26, -1, "", player, (float)((new Random()).Next(-1, 1)), (float)damage, (float)0);
Tools.Broadcast(Tools.FindPlayer(args.PlayerID) + " slapped " + Tools.FindPlayer(player) + " for " + damage.ToString() + " damage."); Tools.Broadcast(Tools.FindPlayer(args.PlayerID) + " slapped " + Tools.FindPlayer(player) + " for " + damage.ToString() + " damage.");
} }
} }