AstralTransRocketries/MCGalaxy
1
0
Fork 0
mirror of https://github.com/ClassiCube/MCGalaxy.git synced 2025-09-14 09:45:11 -04:00
Code Issues Packages Projects Releases Wiki Activity

Remove fail /votekick command

Browse Source
This commit is contained in:
UnknownShadow200 2018-05-27 14:50:55 +10:00
parent a36437b98a
commit a167ea1c8d
5 changed files with 0 additions and 113 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

91
MCGalaxy/Commands/Moderation/CmdVoteKick.cs
View File

@ -1,91 +0,0 @@
/*
Copyright 2011 MCForge
Dual-licensed under the Educational Community License, Version 2.0 and
the GNU General Public License, Version 3 (the "Licenses"); you may
not use this file except in compliance with the Licenses. You may
obtain a copy of the Licenses at
http://www.opensource.org/licenses/ecl2.php
http://www.gnu.org/licenses/gpl-3.0.html
Unless required by applicable law or agreed to in writing,
software distributed under the Licenses are distributed on an "AS IS"
BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
or implied. See the Licenses for the specific language governing
permissions and limitations under the Licenses.
*/
using System;
using MCGalaxy.Commands.Chatting;
using MCGalaxy.Tasks;
namespace MCGalaxy.Commands.Moderation {
public sealed class CmdVoteKick : Command {
public override string name { get { return "VoteKick"; } }
public override string type { get { return CommandTypes.Moderation; } }
public override LevelPermission defaultRank { get { return LevelPermission.Operator; } }
public override bool SuperUseable { get { return false; } }
public override void Use(Player p, string message) {
if (message.Length == 0 || message.IndexOf(' ') != -1) { Help(p); return; }
if (!MessageCmd.CanSpeak(p, name)) return;
if (Server.voteKickInProgress) { Player.Message(p, "Please wait for the current vote to finish!"); return; }
Player who = PlayerInfo.FindMatches(p, message);
if (who == null) return;
if (who.Rank >= p.Rank) {
Chat.MessageGlobal(p, p.ColoredName + " %Stried to votekick " + who.ColoredName + " %Sbut failed!", false);
return;
}
Chat.MessageOps(p.ColoredName + " %Sused &a/votekick");
Chat.MessageGlobal("&9A vote to kick {0} %Shas been called!", who.ColoredName);
Chat.MessageGlobal("&9Type &aY %Sor &cN %Sto vote.");
// 1/3rd of the players must vote or nothing happens
// Keep it at 0 to disable min number of votes
Server.voteKickVotesNeeded = 3; //(int)(PlayerInfo.players.Count / 3) + 1;
Server.voteKickInProgress = true;
Server.MainScheduler.QueueOnce(VoteTimerCallback, who.name, TimeSpan.FromSeconds(30));
}
void VoteTimerCallback(SchedulerTask task) {
Server.voteKickInProgress = false;
int votesYes = 0, votesNo = 0;
Player[] players = PlayerInfo.Online.Items;
foreach (Player pl in players) {
if (pl.voteKickChoice == VoteKickChoice.Yes) votesYes++;
if (pl.voteKickChoice == VoteKickChoice.No) votesNo++;
pl.voteKickChoice = VoteKickChoice.NotYetVoted;
}
string name = (string)task.State;
Player who = PlayerInfo.FindExact(name);
if (who == null) {
Chat.MessageGlobal("{0} was not kicked, as they already left the server.", name); return;
}
int netVotesYes = votesYes - votesNo;
// Should we also send this to players?
Chat.MessageOps("Vote Ended. Results: &aY: " + votesYes + " &cN: " + votesNo);
Logger.Log(LogType.UserActivity, "VoteKick results for {0}: {1} yes and {2} no votes.",
who.DisplayName, votesYes, votesNo);
if (votesYes + votesNo < Server.voteKickVotesNeeded) {
Chat.MessageGlobal("Not enough votes were made. {0} %Sshall remain!", who.ColoredName);
} else if (netVotesYes > 0) {
Chat.MessageGlobal("The people have spoken, {0} %Sis gone!", who.ColoredName);
who.Kick("Vote-Kick: The people have spoken!");
} else {
Chat.MessageGlobal("{0} %Sshall remain!", who.ColoredName);
}
}
public override void Help(Player p) {
Player.Message(p, "%T/VoteKick [player]");
Player.Message(p, "%HCalls a 30sec vote to kick [player]");
}
}
}

1
MCGalaxy/MCGalaxy_.csproj
View File

@ -322,7 +322,6 @@
<Compile Include="Commands\Moderation\CmdUndoPlayer.cs" />
<Compile Include="Commands\Moderation\CmdVIP.cs" />
<Compile Include="Commands\Moderation\CmdVoice.cs" />
<Compile Include="Commands\Moderation\CmdVoteKick.cs" />
<Compile Include="Commands\Moderation\CmdWarn.cs" />
<Compile Include="Commands\Moderation\CmdWhitelist.cs" />
<Compile Include="Commands\Moderation\CmdXban.cs" />

5
MCGalaxy/Player/Player.Fields.cs
View File

@ -26,8 +26,6 @@ using BlockID = System.UInt16;
namespace MCGalaxy {
public enum VoteKickChoice { NotYetVoted, Yes, No }
public partial class Player : IDisposable {
public static VolatileArray<Player> pending = new VolatileArray<Player>(false);
@ -205,9 +203,6 @@ namespace MCGalaxy {
public string summonedMap;
internal Position tempPos;
// CmdVoteKick
public VoteKickChoice voteKickChoice = VoteKickChoice.NotYetVoted;
// Extra storage for custom commands
public ExtrasCollection Extras = new ExtrasCollection();

12
MCGalaxy/Player/Player.Handlers.cs
View File

@ -618,18 +618,6 @@ namespace MCGalaxy {
}
bool IsHandledMessage(string text) {
if (Server.voteKickInProgress && text.Length == 1) {
if (text.CaselessEq("y")) {
voteKickChoice = VoteKickChoice.Yes;
SendMessage("Thanks for voting!");
return true;
} else if (text.CaselessEq("n")) {
voteKickChoice = VoteKickChoice.No;
SendMessage("Thanks for voting!");
return true;
}
}
if (Server.voting) {
string test = text.ToLower();
if (CheckVote(test, this, "y", "yes", ref Server.YesVotes) ||

4
MCGalaxy/Server/Server.Fields.cs
View File

@ -79,10 +79,6 @@ namespace MCGalaxy {
public static string moneys;
public static string IP;
public static string RestartPath;
//Global VoteKick In Progress Flag
public static bool voteKickInProgress = false;
public static int voteKickVotesNeeded = 0;
// Extra storage for custom commands
public static ExtrasCollection Extras = new ExtrasCollection();