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

Style: Move hardcoded commands out of Player.Handlers.cs

Browse Source
This commit is contained in:
UnknownShadow200 2016-09-15 18:23:42 +10:00
parent 1f2b31bc6d
commit 51a2ffb677
6 changed files with 130 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
CorePlugin/ChatHandler.cs Normal file
View File

@ -0,0 +1,49 @@
/*
Copyright 2015 MCGalaxy team
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 System.IO;
using MCGalaxy;
namespace MCGalaxy.Core {
internal static class ChatHandler {
internal static void HandleCommand(string cmd, Player p, string message) {
//DO NOT REMOVE THE TWO COMMANDS BELOW, /PONY AND /RAINBOWDASHLIKESCOOLTHINGS. -EricKilla
if (cmd == "pony") {
if (p.ponycount < 2) {
Chat.MessageAll("{0} %Sjust so happens to be a proud brony! Everyone give {0} %Sa brohoof!", p.ColoredName);
} else {
p.SendMessage("You have used this command 2 times. You cannot use it anymore! Sorry, Brony!");
}
p.ponycount++;
Plugin.CancelPlayerEvent(PlayerEvents.PlayerCommand, p);
} else if (cmd == "rainbowdashlikescoolthings") {
if (p.rdcount < 2) {
Chat.MessageAll("&1T&2H&3I&4S &5S&6E&7R&8V&9E&aR &bJ&cU&dS&eT &fG&0O&1T &22&30 &4P&CE&7R&DC&EE&9N&1T &5C&6O&7O&8L&9E&aR&b!");
} else {
p.SendMessage("You have used this command 2 times. You cannot use it anymore! Sorry, Brony!");
}
p.rdcount++;
Plugin.CancelPlayerEvent(PlayerEvents.PlayerCommand, p);
}
}
}
}

1
CorePlugin/ConnectHandler.cs
View File

@ -20,7 +20,6 @@ using System.IO;
using MCGalaxy; using MCGalaxy;
namespace MCGalaxy.Core { namespace MCGalaxy.Core {
internal static class ConnectHandler { internal static class ConnectHandler {
internal static void HandleConnect(Player p) { internal static void HandleConnect(Player p) {

3
CorePlugin/CorePlugin.cs
View File

@ -28,10 +28,13 @@ namespace MCGalaxy.Core {
public override void Load(bool startup) { public override void Load(bool startup) {
OnPlayerConnectEvent.Register(ConnectHandler.HandleConnect, OnPlayerConnectEvent.Register(ConnectHandler.HandleConnect,
Priority.System_Level, this, false); Priority.System_Level, this, false);
OnPlayerCommandEvent.Register(ChatHandler.HandleCommand,
Priority.System_Level, this, false);
} }
public override void Unload(bool shutdown) { public override void Unload(bool shutdown) {
OnPlayerConnectEvent.UnRegister(this); OnPlayerConnectEvent.UnRegister(this);
OnPlayerCommandEvent.UnRegister(this);
} }
} }
} }

1
MCGalaxy_.csproj
View File

@ -412,6 +412,7 @@
<Compile Include="Config\ServerProperties.cs" /> <Compile Include="Config\ServerProperties.cs" />
<Compile Include="Config\PropertiesFile.cs" /> <Compile Include="Config\PropertiesFile.cs" />
<Compile Include="Config\StringAttributes.cs" /> <Compile Include="Config\StringAttributes.cs" />
<Compile Include="CorePlugin\ChatHandler.cs" />
<Compile Include="CorePlugin\CorePlugin.cs" /> <Compile Include="CorePlugin\CorePlugin.cs" />
<Compile Include="CorePlugin\ConnectHandler.cs" /> <Compile Include="CorePlugin\ConnectHandler.cs" />
<Compile Include="Database\BlockDB.cs" /> <Compile Include="Database\BlockDB.cs" />

2
Network/IRCBot.cs
View File

@ -188,7 +188,7 @@ namespace MCGalaxy {
void Player_PlayerChat(Player p, string message) { void Player_PlayerChat(Player p, string message) {
if (!Server.irc ||!IsConnected()) return; if (!Server.irc ||!IsConnected()) return;
if (String.IsNullOrEmpty(message.Trim(trimChars))) return; if (message.Trim(trimChars) == "") return;
string name = Server.ircPlayerTitles ? p.FullName : p.group.prefix + p.ColoredName; string name = Server.ircPlayerTitles ? p.FullName : p.group.prefix + p.ColoredName;
Say(name + "%S: " + message, p.opchat); Say(name + "%S: " + message, p.opchat);

171
Player/Player.Handlers.cs
View File

@ -23,7 +23,7 @@ using MCGalaxy.Commands;
using MCGalaxy.Games; using MCGalaxy.Games;
using MCGalaxy.SQL; using MCGalaxy.SQL;
namespace MCGalaxy { namespace MCGalaxy {
public sealed partial class Player : IDisposable { public sealed partial class Player : IDisposable {
bool removedFromPending = false; bool removedFromPending = false;
@ -119,7 +119,7 @@ namespace MCGalaxy {
byte heldExt = 0; byte heldExt = 0;
byte heldBlock = GetActualHeldBlock(out heldExt); byte heldBlock = GetActualHeldBlock(out heldExt);
int index = level.PosToInt(x, y, z); int index = level.PosToInt(x, y, z);
if (doDelete) { if (doDelete) {
if (DeleteBlock(old, x, y, z, block, extBlock)) if (DeleteBlock(old, x, y, z, block, extBlock))
level.AddToBlockDB(this, index, heldBlock, heldExt, true); level.AddToBlockDB(this, index, heldBlock, heldExt, true);
@ -178,7 +178,7 @@ namespace MCGalaxy {
try { try {
int size = PacketSize(buffer); int size = PacketSize(buffer);
if (size == -2) return new byte[1]; // WoM get request if (size == -2) return new byte[1]; // WoM get request
if (size == -1) return new byte[0]; // invalid packet if (size == -1) return new byte[0]; // invalid packet
if (buffer.Length < size) return buffer; if (buffer.Length < size) return buffer;
HandlePacket(buffer); HandlePacket(buffer);
@ -195,8 +195,8 @@ namespace MCGalaxy {
int PacketSize(byte[] buffer) { int PacketSize(byte[] buffer) {
switch (buffer[0]) { switch (buffer[0]) {
case (byte)'G': return -2; //For wom case (byte)'G': return -2; //For wom
case Opcode.Handshake: return 131; case Opcode.Handshake: return 131;
case Opcode.SetBlockClient: case Opcode.SetBlockClient:
if (!loggedIn) goto default; if (!loggedIn) goto default;
return 9; return 9;
@ -206,9 +206,9 @@ namespace MCGalaxy {
case Opcode.Message: case Opcode.Message:
if (!loggedIn) goto default; if (!loggedIn) goto default;
return 66; return 66;
case Opcode.CpeExtInfo: return 67; case Opcode.CpeExtInfo: return 67;
case Opcode.CpeExtEntry: return 69; case Opcode.CpeExtEntry: return 69;
case Opcode.CpeCustomBlockSupportLevel: return 2; case Opcode.CpeCustomBlockSupportLevel: return 2;
default: default:
if (!dontmindme) if (!dontmindme)
Leave("Unhandled message id \"" + buffer[0] + "\"!", true); Leave("Unhandled message id \"" + buffer[0] + "\"!", true);
@ -242,7 +242,7 @@ namespace MCGalaxy {
void HandleBlockchange(byte[] packet) { void HandleBlockchange(byte[] packet) {
try { try {
if (!loggedIn || CheckBlockSpam()) return; if (!loggedIn || CheckBlockSpam()) return;
ushort x = NetUtils.ReadU16(packet, 1); ushort x = NetUtils.ReadU16(packet, 1);
ushort y = NetUtils.ReadU16(packet, 3); ushort y = NetUtils.ReadU16(packet, 3);
ushort z = NetUtils.ReadU16(packet, 5); ushort z = NetUtils.ReadU16(packet, 5);
@ -285,7 +285,7 @@ return;
byte heldBlock = packet[1]; byte heldBlock = packet[1];
if (HasCpeExt(CpeExt.HeldBlock)) if (HasCpeExt(CpeExt.HeldBlock))
RawHeldBlock = heldBlock; RawHeldBlock = heldBlock;
ushort x = NetUtils.ReadU16(packet, 2); ushort x = NetUtils.ReadU16(packet, 2);
ushort y = NetUtils.ReadU16(packet, 4); ushort y = NetUtils.ReadU16(packet, 4);
ushort z = NetUtils.ReadU16(packet, 6); ushort z = NetUtils.ReadU16(packet, 6);
@ -404,7 +404,7 @@ return;
if (b == Block.rockethead) level.MakeExplosion(x, y, z, 0); if (b == Block.rockethead) level.MakeExplosion(x, y, z, 0);
if (b == Block.creeper) level.MakeExplosion(x, y, z, 1); if (b == Block.creeper) level.MakeExplosion(x, y, z, 1);
if (b == Block.rock || b == Block.stone) { if (b == Block.rock || b == Block.stone) {
if (explode) level.MakeExplosion(x, y, z, 1); if (explode) level.MakeExplosion(x, y, z, 1);
if (b == Block.rock) { if (b == Block.rock) {
SendChatFrom(this, ColoredName + "%S" + customMessage, false); SendChatFrom(this, ColoredName + "%S" + customMessage, false);
} else { } else {
@ -441,82 +441,82 @@ return;
} }
void HandleChat(byte[] packet) { void HandleChat(byte[] packet) {
if (!loggedIn) return; if (!loggedIn) return;
byte continued = packet[1]; byte continued = packet[1];
string text = GetString(packet, 2); string text = GetString(packet, 2);
LastAction = DateTime.UtcNow; LastAction = DateTime.UtcNow;
if (FilterChat(ref text, continued)) return; if (FilterChat(ref text, continued)) return;
if (text != "/afk" && IsAfk) if (text != "/afk" && IsAfk)
CmdAfk.ToggleAfk(this, ""); CmdAfk.ToggleAfk(this, "");
// Typing //Command appears in chat as /command // Typing //Command appears in chat as /command
// Suggested by McMrCat // Suggested by McMrCat
if (text.StartsWith("//")) { if (text.StartsWith("//")) {
text = text.Remove(0, 1); text = text.Remove(0, 1);
} else if (DoCommand(text)) { } else if (DoCommand(text)) {
return;
}
// People who are muted can't speak or vote
if (muted) { SendMessage("You are muted."); return; } //Muted: Only allow commands
// Lava Survival map vote recorder
if ( Server.lava.HasPlayer(this) && Server.lava.HasVote(text.ToLower()) ) {
if ( Server.lava.AddVote(this, text.ToLower()) ) {
SendMessage("Your vote for &5" + text.ToLower().Capitalize() + " %Shas been placed. Thanks!");
Server.lava.map.ChatLevelOps(name + " voted for &5" + text.ToLower().Capitalize() + "%S.");
return; return;
} }
else {
// People who are muted can't speak or vote SendMessage("&cYou already voted!");
if (muted) { SendMessage("You are muted."); return; } //Muted: Only allow commands return;
// Lava Survival map vote recorder
if ( Server.lava.HasPlayer(this) && Server.lava.HasVote(text.ToLower()) ) {
if ( Server.lava.AddVote(this, text.ToLower()) ) {
SendMessage("Your vote for &5" + text.ToLower().Capitalize() + " %Shas been placed. Thanks!");
Server.lava.map.ChatLevelOps(name + " voted for &5" + text.ToLower().Capitalize() + "%S.");
return;
}
else {
SendMessage("&cYou already voted!");
return;
}
} }
// Filter out bad words }
if (Server.profanityFilter) text = ProfanityFilter.Parse(text); // Filter out bad words
if (Server.profanityFilter) text = ProfanityFilter.Parse(text);
if (IsHandledMessage(text)) return;
if (IsHandledMessage(text)) return;
// Put this after vote collection so that people can vote even when chat is moderated
if (Server.chatmod && !voice) { SendMessage("Chat moderation is on, you cannot speak."); return; } // Put this after vote collection so that people can vote even when chat is moderated
if (Server.chatmod && !voice) { SendMessage("Chat moderation is on, you cannot speak."); return; }
if (ChatModes.Handle(this, text)) return; if (ChatModes.Handle(this, text)) return;
if (text[0] == ':' && PlayingTntWars) { if (text[0] == ':' && PlayingTntWars) {
string newtext = text.Remove(0, 1).Trim(); string newtext = text.Remove(0, 1).Trim();
TntWarsGame it = TntWarsGame.GetTntWarsGame(this); TntWarsGame it = TntWarsGame.GetTntWarsGame(this);
if ( it.GameMode == TntWarsGame.TntWarsGameMode.TDM ) { if ( it.GameMode == TntWarsGame.TntWarsGameMode.TDM ) {
TntWarsGame.player pl = it.FindPlayer(this); TntWarsGame.player pl = it.FindPlayer(this);
foreach ( TntWarsGame.player p in it.Players ) { foreach ( TntWarsGame.player p in it.Players ) {
if ( pl.Red && p.Red ) SendMessage(p.p, "To Team " + Colors.red + "-" + color + name + Colors.red + "- " + Server.DefaultColor + newtext); if ( pl.Red && p.Red ) SendMessage(p.p, "To Team " + Colors.red + "-" + color + name + Colors.red + "- " + Server.DefaultColor + newtext);
if ( pl.Blue && p.Blue ) SendMessage(p.p, "To Team " + Colors.blue + "-" + color + name + Colors.blue + "- " + Server.DefaultColor + newtext); if ( pl.Blue && p.Blue ) SendMessage(p.p, "To Team " + Colors.blue + "-" + color + name + Colors.blue + "- " + Server.DefaultColor + newtext);
}
Server.s.Log("[TNT Wars] [TeamChat (" + ( pl.Red ? "Red" : "Blue" ) + ") " + name + " " + newtext);
return;
} }
Server.s.Log("[TNT Wars] [TeamChat (" + ( pl.Red ? "Red" : "Blue" ) + ") " + name + " " + newtext);
return;
} }
}
text = HandleJoker(text); text = HandleJoker(text);
if (Chatroom != null) { Chat.ChatRoom(this, text, true, Chatroom); return; } if (Chatroom != null) { Chat.ChatRoom(this, text, true, Chatroom); return; }
if (!level.worldChat) { if (!level.worldChat) {
Server.s.Log("<" + name + ">[level] " + text); Server.s.Log("<" + name + ">[level] " + text);
Chat.GlobalChatLevel(this, text, true); Chat.GlobalChatLevel(this, text, true);
} else {
Server.s.Log("<" + name + "> " + text);
if (OnChat != null) OnChat(this, text);
if (PlayerChat != null) PlayerChat(this, text);
OnPlayerChatEvent.Call(this, text);
if (cancelchat) { cancelchat = false; return; }
if (Server.worldChat) {
SendChatFrom(this, text);
} else { } else {
Server.s.Log("<" + name + "> " + text); Chat.GlobalChatLevel(this, text, true);
if (OnChat != null) OnChat(this, text);
if (PlayerChat != null) PlayerChat(this, text);
OnPlayerChatEvent.Call(this, text);
if (cancelchat) { cancelchat = false; return; }
if (Server.worldChat) {
SendChatFrom(this, text);
} else {
Chat.GlobalChatLevel(this, text, true);
}
} }
CheckForMessageSpam(); }
CheckForMessageSpam();
} }
bool FilterChat(ref string text, byte continued) { bool FilterChat(ref string text, byte continued) {
@ -679,25 +679,6 @@ return;
if (Server.verifyadmins && adminpen && !(cmd == "pass" || cmd == "setpass")) { if (Server.verifyadmins && adminpen && !(cmd == "pass" || cmd == "setpass")) {
SendMessage("&cYou must verify first with %T/pass [Password]"); return false; SendMessage("&cYou must verify first with %T/pass [Password]"); return false;
} }
//DO NOT REMOVE THE TWO COMMANDS BELOW, /PONY AND /RAINBOWDASHLIKESCOOLTHINGS. -EricKilla
if (cmd == "pony") {
if (ponycount < 2) {
Chat.MessageAll("{0} %Sjust so happens to be a proud brony! Everyone give {0} %Sa brohoof!", ColoredName);
ponycount++;
} else {
SendMessage("You have used this command 2 times. You cannot use it anymore! Sorry, Brony!");
}
return false;
} else if (cmd == "rainbowdashlikescoolthings") {
if (rdcount < 2) {
Chat.MessageAll("&1T&2H&3I&4S &5S&6E&7R&8V&9E&aR &bJ&cU&dS&eT &fG&0O&1T &22&30 &4P&CE&7R&DC&EE&9N&1T &5C&6O&7O&8L&9E&aR&b!");
rdcount++;
} else {
SendMessage("You have used this command 2 times. You cannot use it anymore! Sorry, Brony!");
}
return false;
}
return true; return true;
} }
@ -741,7 +722,7 @@ return;
bool UseCommand(Command command, string message) { bool UseCommand(Command command, string message) {
string cmd = command.name; string cmd = command.name;
if (cmd != "repeat" && cmd != "pass") { if (cmd != "repeat" && cmd != "pass") {
lastCMD = message == "" ? cmd : cmd + " " + message; lastCMD = message == "" ? cmd : cmd + " " + message;
lastCmdTime = DateTime.UtcNow; lastCmdTime = DateTime.UtcNow;
} }
if (cmd != "pass") Server.s.CommandUsed(name + " used /" + cmd + " " + message); if (cmd != "pass") Server.s.CommandUsed(name + " used /" + cmd + " " + message);