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

Cleanup /xban.

Browse Source
This commit is contained in:
UnknownShadow200 2016-01-30 07:37:32 +11:00
parent 063c8794f5
commit 32e500d63f
3 changed files with 40 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Commands/CPE/CmdCustomColors.cs
View File

@ -63,14 +63,14 @@ namespace MCGalaxy.Commands {
char code2 = code;
if (Colors.MapColor(ref code2)) {
Player.SendMessage(p, "There is already a custom or server defined color with the code " + code +
", you must either use a different code or use \"/ccols remove " + code + "\"");
", you must either use a different code or use \"%T/ccols remove " + code + "%S\"");
return;
}
string name = args[2];
if (Colors.Parse(name) != "") {
Player.SendMessage(p, "There is already an existing standard or " +
"custom color with the name\"" + name + "\"."); return;
"custom color with the name \"" + name + "\"."); return;
}
char fallback = args[3][0];

47
Commands/Moderation/CmdXban.cs
View File

@ -15,55 +15,30 @@
or implied. See the Licenses for the specific language governing
permissions and limitations under the Licenses.
*/
namespace MCGalaxy.Commands
{
public sealed class CmdXban : Command
{
namespace MCGalaxy.Commands {
public sealed class CmdXban : Command {
public override string name { get { return "xban"; } }
public override string shortcut { get { return ""; } }
public override string type { get { return CommandTypes.Moderation; } }
public override bool museumUsable { get { return false; } }
public override LevelPermission defaultRank { get { return LevelPermission.Operator; } }
public CmdXban() { }
public override void Use(Player p, string message)
{
public override void Use(Player p, string message) {
if (message == "") { Help(p); return; }
Player who = Player.Find(message.Split(' ')[0]);
string msg = message.Split(' ')[0];
if (p != null)
{
p.ignorePermission = true;
}
try
{
string name = message.Split(' ')[0];
Player who = Player.Find(name);
Command.all.Find("ban").Use(p, message);
Command.all.Find("banip").Use(p, "@" + name);
if (who != null)
{
Command.all.Find("xundo").Use(p, msg);
Command.all.Find("ban").Use(p, msg);
Command.all.Find("banip").Use(p, "@" + msg);
Command.all.Find("kick").Use(p, message);
Command.all.Find("xundo").Use(p, msg);
}
else
{
Command.all.Find("ban").Use(p, msg);
Command.all.Find("banip").Use(p, "@" + msg);
Command.all.Find("xundo").Use(p, msg);
Command.all.Find("xundo").Use(p, name);
}
}
finally
{
if (p != null) p.ignorePermission = false;
}
}
public override void Help(Player p)
{
public override void Help(Player p) {
Player.SendMessage(p, "/xban [name] [message]- Bans, banips, undoes, and kicks [name] with [message], if specified.");
}
}

20
Commands/World/CmdReload.cs
View File

@ -16,10 +16,10 @@
permissions and limitations under the Licenses.
*/
using System.IO;
namespace MCGalaxy.Commands
{
public sealed class CmdReload : Command
{
namespace MCGalaxy.Commands {
public sealed class CmdReload : Command {
public override string name { get { return "reload"; } }
public override string shortcut { get { return "rd"; } }
public override string type { get { return CommandTypes.World; } }
@ -27,21 +27,17 @@ namespace MCGalaxy.Commands
public override LevelPermission defaultRank { get { return LevelPermission.Operator; } }
public CmdReload() { }
public override void Use(Player p, string message)
{
public override void Use(Player p, string message) {
if (p == null && message == "") {
Player.SendMessage(p, "You must give a level name when running the command from console.");
return;
Player.SendMessage(p, "You must give a level name when running the command from console."); return;
}
string name = message == "" ? p.level.name : message;
if (!File.Exists("levels/" + name + ".lvl")) {
Player.SendMessage(p, "The given level \"" + name + "\" does not exist.");
return;
Player.SendMessage(p, "The given level \"" + name + "\" does not exist."); return;
}
if (Server.mainLevel.name == name) {
Player.SendMessage(p, "You cannot reload the main level.");
return;
Player.SendMessage(p, "You cannot reload the main level."); return;
}
foreach (Player pl in Player.players) {