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

Using Player Damage instead of Kill Me message for /kill

Browse source 
Added current value of DisableBuild to the debug-condig output
This commit is contained in:
ricky 2011-06-14 12:16:12 +10:00
parent c268118c9c
commit a1a82745d0
2 changed files with 11 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

20
TShockAPI/Commands.cs
View file

@ -297,14 +297,14 @@ namespace TShockAPI
ConfigurationManager.banTnt, ConfigurationManager.kickTnt, ConfigurationManager.banTnt, ConfigurationManager.kickTnt,
ConfigurationManager.banBoom, ConfigurationManager.kickBoom); ConfigurationManager.banBoom, ConfigurationManager.kickBoom);
Tools.SendMessage(ply, lineTwo, Color.Yellow); Tools.SendMessage(ply, lineTwo, Color.Yellow);
string lineThree = string.Format("InvMultiplier : {0}, ProtectS : {1}, ProtectR : {2}, DMS : {3}, SpawnRate {4}", string lineThree = string.Format("RangeChecks : {0}, DisableBuild : {1}, ProtectSpawn : {2}, ProtectRadius : {3}",
ConfigurationManager.invasionMultiplier, ConfigurationManager.spawnProtect, ConfigurationManager.rangeChecks, ConfigurationManager.disableBuild,
ConfigurationManager.spawnProtectRadius, ConfigurationManager.defaultMaxSpawns, ConfigurationManager.spawnProtect, ConfigurationManager.spawnProtectRadius);
ConfigurationManager.defaultSpawnRate);
Tools.SendMessage(ply, lineThree, Color.Yellow); Tools.SendMessage(ply, lineThree, Color.Yellow);
string lineFour = string.Format("MaxSlots : {0}, RangeChecks : {1}, SpamChecks : {2}", string lineFour = string.Format("MaxSlots : {0}, SpamChecks : {1}, InvMultiplier : {2}, DMS : {3}, SpawnRate {4}",
ConfigurationManager.maxSlots, ConfigurationManager.rangeChecks, ConfigurationManager.maxSlots, ConfigurationManager.spamChecks,
ConfigurationManager.spamChecks); ConfigurationManager.invasionMultiplier, ConfigurationManager.defaultMaxSpawns,
ConfigurationManager.defaultSpawnRate);
Tools.SendMessage(ply, lineFour, Color.Yellow); Tools.SendMessage(ply, lineFour, Color.Yellow);
} }
@ -1006,13 +1006,11 @@ namespace TShockAPI
Tools.SendMessage(adminplr, "Invalid player!", Color.Red); Tools.SendMessage(adminplr, "Invalid player!", Color.Red);
else if (player == -2) else if (player == -2)
Tools.SendMessage(adminplr, "More than one player matched!", Color.Red); Tools.SendMessage(adminplr, "More than one player matched!", Color.Red);
else if (player == adminplr)
Tools.SendMessage(adminplr, "Can't kill yourself!", Color.Red);
else else
{ {
Tools.SendMessage(adminplr, string.Format("You just killed {0}!", Tools.FindPlayer(player))); Tools.SendMessage(adminplr, string.Format("You just killed {0}!", Tools.FindPlayer(player)));
Tools.SendMessage(player, string.Format("{0} just killed you!", Tools.FindPlayer(adminplr))); Tools.SendMessage(player, string.Format("{0} just killed you!", Tools.FindPlayer(adminplr)));
TShock.KillMe(player); TShock.PlayerDamage(player, 999999);
} }
} }
@ -1044,7 +1042,7 @@ namespace TShockAPI
{ {
int.TryParse(args.Parameters[1], out damage); int.TryParse(args.Parameters[1], out damage);
} }
NetMessage.SendData(26, -1, -1, "", player, ((new Random()).Next(-1, 1)), damage, (float)0); TShock.PlayerDamage(player, damage);
Tools.Broadcast(string.Format("{0} slapped {1} for {2} damage.", Tools.Broadcast(string.Format("{0} slapped {1} for {2} damage.",
Tools.FindPlayer(adminplr), Tools.FindPlayer(player), damage)); Tools.FindPlayer(adminplr), Tools.FindPlayer(player), damage));
} }

5
TShockAPI/TShock.cs
View file

@ -837,10 +837,9 @@ namespace TShockAPI
} }
} }
public static void KillMe(int plr) public static void PlayerDamage(int plr, int damage)
{ {
for (int i = 0; i < Main.player.Length; i++) NetMessage.SendData(26, -1, -1, "", plr, ((new Random()).Next(-1, 1)), damage, (float)0);
NetMessage.SendData(44, i, -1, "", plr, 1, 9999999, (float)0);
} }
//TODO : Notify the player if there is more than one match. (or do we want a First() kinda thing?) //TODO : Notify the player if there is more than one match. (or do we want a First() kinda thing?)