Merge branch 'develop' into FF/Develop

This commit is contained in:
funkyfranky
2018-09-18 11:03:31 +02:00
11 changed files with 3645 additions and 3262 deletions

View File

@@ -507,7 +507,6 @@ function EVENT:RemoveEvent( EventClass, EventID )
self.Events = self.Events or {}
self.Events[EventID] = self.Events[EventID] or {}
self.Events[EventID][EventPriority] = self.Events[EventID][EventPriority] or {}
self.Events[EventID][EventPriority][EventClass] = self.Events[EventID][EventPriority][EventClass]
self.Events[EventID][EventPriority][EventClass] = nil