FlightControl-Master/MOOSE
1
0
Fork 0
mirror of https://github.com/FlightControl-Master/MOOSE.git synced 2025-10-29 16:58:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/origin/master' into release-2-2-pre

Browse Source
This commit is contained in:
FlightControl
2017-06-29 14:59:32 +02:00
parent b245292d11 2f4361c97a
commit 78085d3de2
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Moose Development/Moose/Core/Event.lua
View File

@@ -743,7 +743,10 @@ function EVENT:onEvent( Event )
local EventMeta = _EVENTMETA[Event.id] local EventMeta = _EVENTMETA[Event.id]
if self and self.Events and self.Events[Event.id] then if self and
self.Events and
self.Events[Event.id] and
( Event.initiator ~= nil or ( Event.initiator == nil and Event.id ~= EVENTS.PlayerLeaveUnit ) ) then
if Event.initiator then if Event.initiator then