diff --git a/Events/Player.Events.cs b/Events/Player.Events.cs index d5a1ef98f..67d54c92d 100644 --- a/Events/Player.Events.cs +++ b/Events/Player.Events.cs @@ -22,12 +22,12 @@ namespace MCGalaxy { /// This is the player object public sealed partial class Player { - internal bool cancelcommand = false; - internal bool cancelchat = false; - internal bool cancelmove = false; - internal bool cancelBlock = false; - internal bool cancelmysql = false; - internal bool cancelmessage = false; + public bool cancelcommand = false; + public bool cancelchat = false; + public bool cancelmove = false; + public bool cancelBlock = false; + public bool cancelmysql = false; + public bool cancelmessage = false; internal bool HasBlockchange { get { return Blockchange != null; } } //Should people be able to cancel this event? diff --git a/Network/Player.Networking.cs b/Network/Player.Networking.cs index 1d8db0a0e..2ac6411d7 100644 --- a/Network/Player.Networking.cs +++ b/Network/Player.Networking.cs @@ -210,15 +210,12 @@ namespace MCGalaxy { public void SendMessage(byte id, string message, bool colorParse = true) { message = ConvertMessage(message, colorParse); int totalTries = 0; - if ( MessageRecieve != null ) + if (MessageRecieve != null) MessageRecieve(this, message); - if ( OnMessageRecieve != null ) + if (OnMessageRecieve != null) OnMessageRecieve(this, message); OnMessageRecieveEvent.Call(this, message); - if ( cancelmessage ) { - cancelmessage = false; - return; - } + if (cancelmessage) { cancelmessage = false; return; } retryTag: try { foreach (string raw in LineWrapper.Wordwrap(message)) { diff --git a/Player/Player.Handlers.cs b/Player/Player.Handlers.cs index 842499767..d7537ae70 100644 --- a/Player/Player.Handlers.cs +++ b/Player/Player.Handlers.cs @@ -528,9 +528,7 @@ return; if (PlayerChat != null) PlayerChat(this, text); OnPlayerChatEvent.Call(this, text); - if (cancelchat) { - cancelchat = false; return; - } + if (cancelchat) { cancelchat = false; return; } if (Server.worldChat) { SendChatFrom(this, text); } else {