themaster1970sf/TShock
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Not processing events if they have been handled by plugin up the chain

Browse source
This commit is contained in:
ricky 2011-06-21 13:10:42 +10:00
parent dd63436d29
commit 2d9ccb3738
1 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

10
TShockAPI/TShock.cs
View file

@ -257,7 +257,7 @@ namespace TShockAPI
private void OnChat(messageBuffer msg, int ply, string text, HandledEventArgs e) private void OnChat(messageBuffer msg, int ply, string text, HandledEventArgs e)
{ {
if (Main.netMode != 2) if (Main.netMode != 2 || e.Handled)
return; return;
if (msg.whoAmI != ply) if (msg.whoAmI != ply)
@ -294,6 +294,9 @@ namespace TShockAPI
/// <param name="e"></param> /// <param name="e"></param>
private void ServerHooks_OnCommand(string text, HandledEventArgs e) private void ServerHooks_OnCommand(string text, HandledEventArgs e)
{ {
if (e.Handled)
return;
// Damn you ThreadStatic and Redigit // Damn you ThreadStatic and Redigit
if (Main.rand == null) if (Main.rand == null)
{ {
@ -336,6 +339,9 @@ namespace TShockAPI
private void GetData(GetDataEventArgs e) private void GetData(GetDataEventArgs e)
{ {
if (Main.netMode != 2 || e.Handled)
return;
PacketTypes type = e.MsgID; PacketTypes type = e.MsgID;
TSPlayer player = Players[e.Msg.whoAmI]; TSPlayer player = Players[e.Msg.whoAmI];
@ -373,7 +379,7 @@ namespace TShockAPI
private void OnGreetPlayer(int who, HandledEventArgs e) private void OnGreetPlayer(int who, HandledEventArgs e)
{ {
if (Main.netMode != 2) if (Main.netMode != 2 || e.Handled)
return; return;
TSPlayer player = Players[who]; TSPlayer player = Players[who];