Merge branch 'master' of github.com:TShock/TShock

This commit is contained in:
Shank 2011-06-06 16:39:05 -06:00
commit b62fc02d94

View file

@ -301,7 +301,7 @@ namespace TShockAPI
if (ConfigurationManager.banCheater) if (ConfigurationManager.banCheater)
Ban(ply, "Abnormal life increase"); Ban(ply, "Abnormal life increase");
Tools.Kick(ply, "Abnormal life increase"); Tools.Kick(ply, "Abnormal life increase");
Tools.Broadcast(playerName + " was " + (ConfigurationManager.kickCheater ? "banned" : "kicked") + Tools.Broadcast(playerName + " was " + (ConfigurationManager.banCheater ? "banned" : "kicked") +
" because they gained an abnormal amount of health."); " because they gained an abnormal amount of health.");
e.Handled = true; e.Handled = true;
} }
@ -334,7 +334,7 @@ namespace TShockAPI
if (ConfigurationManager.banCheater) if (ConfigurationManager.banCheater)
Ban(ply, "Abnormal mana increase"); Ban(ply, "Abnormal mana increase");
Tools.Kick(ply, "Abnormal mana increase"); Tools.Kick(ply, "Abnormal mana increase");
Tools.Broadcast(playerName + " was " + (ConfigurationManager.kickCheater ? "banned" : "kicked") + Tools.Broadcast(playerName + " was " + (ConfigurationManager.banCheater ? "banned" : "kicked") +
" because they gained an abnormal amount of mana."); " because they gained an abnormal amount of mana.");
e.Handled = true; e.Handled = true;
} }
@ -484,7 +484,7 @@ namespace TShockAPI
if (ConfigurationManager.banCheater) if (ConfigurationManager.banCheater)
Ban(who, "Hacked health."); Ban(who, "Hacked health.");
Tools.Kick(who, "Hacked health."); Tools.Kick(who, "Hacked health.");
Tools.Broadcast(playerName + " was " + (ConfigurationManager.kickCheater ? "banned" : "kicked") + " for hacked health."); Tools.Broadcast(playerName + " was " + (ConfigurationManager.banCheater ? "banned" : "kicked") + " for hacked health.");
} }
} }
if (ConfigurationManager.permaPvp) if (ConfigurationManager.permaPvp)