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

Allow non-plugin delegate handlers to cancel player events.

Browse Source
This commit is contained in:
UnknownShadow200 2016-08-31 16:29:53 +10:00
parent 9c34a134c1
commit cac87fa7e6
3 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Events/Player.Events.cs
View File

@ -22,12 +22,12 @@ namespace MCGalaxy {
/// <summary> This is the player object </summary>
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?

9
Network/Player.Networking.cs
View File

@ -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)) {

4
Player/Player.Handlers.cs
View File

@ -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 {