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

Merge branch 'master' of github.com:Hetal728/MCGalaxy

Browse Source
This commit is contained in:
UnknownShadow200 2016-05-26 10:18:18 +10:00
commit d2e013ce33
5 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Commands/other/CmdReview.cs
View File

@ -92,6 +92,7 @@ namespace MCGalaxy.Commands
} else {
Player.Message(p, "&cThere are no operators on to review your build. Please wait for one to come on and try again.");
}
Player.RaisePlayerAction(p, PlayerAction.Review, null, true);
}
void HandleView(Player p) {

2
Events/Player.Events.cs
View File

@ -17,7 +17,7 @@
*/
using System;
namespace MCGalaxy {
public enum PlayerAction { Joker, Unjoker, AFK, UnAFK, JoinWorld, Me };
public enum PlayerAction { Joker, Unjoker, AFK, UnAFK, JoinWorld, Me, Review };
/// <summary> This is the player object </summary>
public sealed partial class Player {

2
IRC/ForgeBot.cs
View File

@ -181,6 +181,8 @@ namespace MCGalaxy {
msg = p.ColoredName + " %Swent to &8" + message;
else if (action == PlayerAction.Me)
msg = "*" + p.DisplayName + " " + message;
else if (action == PlayerAction.Review)
msg = p.ColoredName + " %Sis requesting a review.";
if (msg != null)
Say(msg, stealth);

4
Player/Chat.cs
View File

@ -205,7 +205,7 @@ namespace MCGalaxy {
p.SendMessage("To Ops &f-" + displayName + "&f- " + text);
Server.s.Log("(OPs): " + name + ": " + text);
Server.IRC.Say(name + ": " + text, true);
Server.IRC.Say(displayName + "%S: " + text, true);
return true;
}
if (text[0] == '+' || (p != null && p.adminchat)) {
@ -218,7 +218,7 @@ namespace MCGalaxy {
p.SendMessage("To Admins &f-" + displayName + "&f- " + text);
Server.s.Log("(Admins): " + name + ": " + text);
Server.IRC.Say(name + ": " + text, true);
Server.IRC.Say(displayName + "%S: " + text, true);
return true;
}
return false;

2
Server/Server.cs
View File

@ -245,7 +245,7 @@ namespace MCGalaxy
public static string ircNick = "ForgeBot";
[ConfigString("irc-server", "IRC bot", null, "irc.esper.net")]
public static string ircServer = "irc.esper.net";
[ConfigString("irc-channel", "IRC bot", null, "#changethis")]
[ConfigString("irc-channel", "IRC bot", null, "#changethis", true)]
public static string ircChannel = "#changethis";
[ConfigString("irc-opchannel", "IRC bot", null, "#changethistoo", true)]
public static string ircOpChannel = "#changethistoo";