diff --git a/Classic/prefs/serverPrefs.cs b/Classic/prefs/serverPrefs.cs index 7451852..5edcd4f 100644 --- a/Classic/prefs/serverPrefs.cs +++ b/Classic/prefs/serverPrefs.cs @@ -71,7 +71,6 @@ $Host::ClassicTelnet = 1; $Host::ClassicTelnetListenPass = "changeme"; $Host::ClassicTelnetPassword = "changeme"; $Host::ClassicTelnetPort = 666; -$Host::ClassicTkLimit = 0; $Host::ClassicUseHighPerformanceCounter = 0; $Host::ClassicViralBanning = 1; $Host::ClassicVoteLog = 1; diff --git a/Classic/scripts/defaultGame.cs b/Classic/scripts/defaultGame.cs index bde18fd..b5486d6 100644 --- a/Classic/scripts/defaultGame.cs +++ b/Classic/scripts/defaultGame.cs @@ -2497,20 +2497,6 @@ function DefaultGame::awardScoreTeamkill(%game, %victimID, %killerID) messageClient(%killerID, 'MsgScoreTeamkill', '\c0You have been penalized for killing teammate %1.', %victimID.name); %game.recalcScore(%killerID); - // z0dd - ZOD, 8/9/03. Auto vote TKers - if(!$Host::TournamentMode) - { - if(($Host::ClassicTkLimit > 4 && %killerID.teamKills >= $Host::ClassicTkLimit) && (getAdmin() == 0)) - { - serverCmdStartNewVote(%victimID, "VoteKickPlayer", %killerID, 0, 0, 0, true); - bottomPrintAll("" @ %killerID.nameBase @ " Has " @ %killerID.teamKills @ " team kills. Recommend voting yes.", 4, 2); - logEcho(%killerID.nameBase @ " GUID: " @ %killerID.guid @ " TKS: " @ %killerID.teamKills, 1); - } - //else - //{ - // BottomPrint(%killerID, "You have " @ %killerID.teamKills @ ", you better cut it out!", 2, 1 ); - //} - } } function DefaultGame::awardScoreTurretTeamKill(%game, %victimID, %killerID) @@ -2520,20 +2506,6 @@ function DefaultGame::awardScoreTurretTeamKill(%game, %victimID, %killerID) messageClient(%killerID, 'MsgScoreTeamkill', '\c0You have been penalized for killing your teammate %1, with a turret.', %victimID.name); %game.recalcScore(%killerID); - // z0dd - ZOD, 6/12/03. Auto vote TKers - if(!$Host::TournamentMode) - { - if(($Host::ClassicTkLimit > 4 && %killerID.teamKills >= $Host::ClassicTkLimit) && (getAdmin() == 0)) - { - serverCmdStartNewVote(%victimID, "VoteKickPlayer", %killerID, 0, 0, 0, true); - bottomPrintAll("" @ %killerID.nameBase @ " Has " @ %killerID.teamKills @ " team kills. Recommend voting yes.", 4, 2); - logEcho(%killerID.nameBase @ " GUID: " @ %killerID.guid @ " TKS: " @ %killerID.teamKills, 1); - } - else - { - BottomPrint(%killerID, "You have " @ %killerID.teamKills @ ", you better cut it out!", 2, 1 ); - } - } } diff --git a/Classic/scripts/serverDefaults.cs b/Classic/scripts/serverDefaults.cs index 73b9fda..e947176 100644 --- a/Classic/scripts/serverDefaults.cs +++ b/Classic/scripts/serverDefaults.cs @@ -60,7 +60,6 @@ $Host::ClassicConnectLog = 1; // Logs all connections to $Host::ClassicAntiTurtleTime = 6; // How many minutes after a stalemate in CTF are the flags returned $Host::ClassicLimitArmors = 0; // Restrict armor types like turrets, larger team dictates amount avail $Host::ClassicBadWordFilter = 0; // Replace potty mouths words with random garbage -$Host::ClassicTkLimit = 0; // When set to 5 or more and no admin is on server, a vote is started to kick the tker $Host::ClassicAllowConsoleAccess = 0; // Allows super admins to use the servers console via Admin hud. $Host::ClassicNoNullVoiceSpam = 0; // Allow or disallow NULL voice usage. 1 enabled NULL voice to be used. $Host::ClassicBalancedBots = 0; // For every client join a bot is disconnected