mirror of
https://github.com/ChocoTaco1/TacoServer.git
synced 2026-01-19 16:14:44 +00:00
Removed
This commit is contained in:
parent
3bd4577832
commit
14caa5aca5
|
|
@ -330,48 +330,6 @@ addRotationMap("GodsRiftLak","Lakrabbit",true,false,-1,-1);
|
||||||
addRotationMap("SolsDescentLak","Lakrabbit",true,true,-1,-1);
|
addRotationMap("SolsDescentLak","Lakrabbit",true,true,-1,-1);
|
||||||
addRotationMap("Crater71Lak","Lakrabbit",true,false,6,-1);
|
addRotationMap("Crater71Lak","Lakrabbit",true,false,6,-1);
|
||||||
//-------------------------------------------------------------------------------
|
//-------------------------------------------------------------------------------
|
||||||
addRotationMap("darrellw-Starlight","Lakrabbit",true,false,-1,-1);
|
|
||||||
addRotationMap("Hybrid-SunChips","Lakrabbit",true,false,-1,-1);
|
|
||||||
addRotationMap("Hybrid-TealMagic","Lakrabbit",true,false,-1,-1);
|
|
||||||
addRotationMap("Tacocat-AshnDust","Lakrabbit",true,false,-1,-1);
|
|
||||||
addRotationMap("Tacocat-Breaker","Lakrabbit",true,true,-1,-1);
|
|
||||||
addRotationMap("Tacocat-DantesHill","Lakrabbit",true,true,-1,-1);
|
|
||||||
addRotationMap("Tacocat-DeepCool","Lakrabbit",true,false,-1,-1);
|
|
||||||
addRotationMap("Tacocat-EmeraldRun","Lakrabbit",true,true,-1,-1);
|
|
||||||
addRotationMap("Tacocat-FairField","Lakrabbit",true,true,-1,-1);
|
|
||||||
addRotationMap("Tacocat-FireBrand","Lakrabbit",true,true,-1,-1);
|
|
||||||
addRotationMap("Tacocat-FroastyLak","Lakrabbit",true,false,-1,-1);
|
|
||||||
addRotationMap("Tacocat-IronGiant","Lakrabbit",true,false,-1,-1);
|
|
||||||
addRotationMap("Tacocat-Jagged","Lakrabbit",true,true,-1,-1);
|
|
||||||
addRotationMap("Tacocat-LucidCold","Lakrabbit",true,true,-1,-1);
|
|
||||||
addRotationMap("Tacocat-MiddlePassage","Lakrabbit",true,true,-1,-1);
|
|
||||||
addRotationMap("Tacocat-Mirage","Lakrabbit",true,true,-1,-1);
|
|
||||||
addRotationMap("Tacocat-Muave","Lakrabbit",true,true,-1,-1);
|
|
||||||
addRotationMap("Tacocat-Silencio","Lakrabbit",true,true,-1,-1);
|
|
||||||
addRotationMap("Tacocat-SnowCrevice","Lakrabbit",true,true,-1,-1);
|
|
||||||
addRotationMap("Tacocat-Spire","Lakrabbit",true,true,-1,-1);
|
|
||||||
addRotationMap("Tacocat-TheStill","Lakrabbit",true,true,-1,-1);
|
|
||||||
addRotationMap("Tacocat-Toxica","Lakrabbit",true,true,-1,-1);
|
|
||||||
addRotationMap("Tacocat-WhiteCap","Lakrabbit",true,true,-1,-1);
|
|
||||||
addRotationMap("Tacocat-Moonscape","Lakrabbit",true,true,-1,-1);
|
|
||||||
addRotationMap("Tacocat-Temporal","Lakrabbit",true,false,-1,-1);
|
|
||||||
addRotationMap("Tacocat-Vein","Lakrabbit",true,false,-1,-1);
|
|
||||||
addRotationMap("DarkTiger-LakIce","Lakrabbit",true,true,-1,-1);
|
|
||||||
addRotationMap("Tacocat-BigSky","Lakrabbit",true,false,-1,-1);
|
|
||||||
addRotationMap("Tacocat-Thawed","Lakrabbit",true,true,-1,-1);
|
|
||||||
addRotationMap("Tacocat-Circular","Lakrabbit",true,true,-1,-1);
|
|
||||||
addRotationMap("Tacocat-RollingGreen","Lakrabbit",true,true,-1,-1);
|
|
||||||
addRotationMap("Tacocat-Hellmire","Lakrabbit",true,true,-1,-1);
|
|
||||||
addRotationMap("Tacocat-HighLaktane","Lakrabbit",true,false,-1,-1);
|
|
||||||
addRotationMap("Tacocat-Hillview","Lakrabbit",true,true,-1,-1);
|
|
||||||
addRotationMap("Tacocat-IceCap","Lakrabbit",true,false,-1,-1);
|
|
||||||
addRotationMap("Tacocat-Yerba","Lakrabbit",true,true,-1,-1);
|
|
||||||
addRotationMap("Tacocat-ColdFoot","Lakrabbit",true,true,-1,-1);
|
|
||||||
addRotationMap("Tacocat-Dunes","Lakrabbit",true,true,-1,-1);
|
|
||||||
addRotationMap("Tacocat-Rusted","Lakrabbit",true,true,-1,-1);
|
|
||||||
addRotationMap("Tacocat-FrostRun","Lakrabbit",true,true,-1,-1);
|
|
||||||
addRotationMap("Tacocat-Zambre","Lakrabbit",true,false,-1,-1);
|
|
||||||
addRotationMap("Tacocat-SoylentJade","Lakrabbit",true,true,-1,-1);
|
|
||||||
//addRotationMap("EscaladeLak","Lakrabbit",true,false,-1,-1);
|
//addRotationMap("EscaladeLak","Lakrabbit",true,false,-1,-1);
|
||||||
//addRotationMap("MagmaticLak","Lakrabbit",true,false,-1,-1);
|
//addRotationMap("MagmaticLak","Lakrabbit",true,false,-1,-1);
|
||||||
//addRotationMap("HillsOfSorrow","Lakrabbit",true,false,-1,-1);
|
//addRotationMap("HillsOfSorrow","Lakrabbit",true,false,-1,-1);
|
||||||
|
|
|
||||||
|
|
@ -5,7 +5,6 @@ $Host::AllowAdminKick = 1;
|
||||||
$Host::AllowAdminPassVote = 1;
|
$Host::AllowAdminPassVote = 1;
|
||||||
$Host::allowAdminPlayerVotes = "0";
|
$Host::allowAdminPlayerVotes = "0";
|
||||||
$Host::AllowAdminStopVote = 1;
|
$Host::AllowAdminStopVote = 1;
|
||||||
$Host::AllowAdminStopVotes = 1;
|
|
||||||
$Host::AllowAdminVotes = 1;
|
$Host::AllowAdminVotes = 1;
|
||||||
$Host::AllowMapScript = "True";
|
$Host::AllowMapScript = "True";
|
||||||
$Host::AllowPlayerVoteChangeMission = 1;
|
$Host::AllowPlayerVoteChangeMission = 1;
|
||||||
|
|
|
||||||
|
|
@ -581,12 +581,12 @@ function serverCmdStartNewVote(%client, %typeName, %arg1, %arg2, %arg3, %arg4, %
|
||||||
case "stopRunningVote":
|
case "stopRunningVote":
|
||||||
if(%client.isSuperAdmin || (%client.isAdmin && $Host::AllowAdminStopVote))
|
if(%client.isSuperAdmin || (%client.isAdmin && $Host::AllowAdminStopVote))
|
||||||
{
|
{
|
||||||
%curTimeLeftMS = ($Host::TimeLimit * 60 * 1000) + $missionStartTime - getSimTime();
|
// %curTimeLeftMS = ($Host::TimeLimit * 60 * 1000) + $missionStartTime - getSimTime();
|
||||||
if(%curTimeLeftMS <= 0) //Dont allow a stop vote after time has expired, then no new time is set - VoteOverTime
|
// if(%curTimeLeftMS <= 0) //Dont allow a stop vote after time has expired, then no new time is set - VoteOverTime
|
||||||
{
|
// {
|
||||||
messageClient(%client, "", "\c2Can't stop time vote after time has expired.");
|
// messageClient(%client, "", "\c2Can't stop vote after time has expired.");
|
||||||
return;
|
// return;
|
||||||
}
|
// }
|
||||||
|
|
||||||
stopCurrentVote(%client);
|
stopCurrentVote(%client);
|
||||||
adminLog(%client, " stopped the vote in progress.");
|
adminLog(%client, " stopped the vote in progress.");
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue