From b8ad0131ea05cd3ae6536f93476a2f50beb74d81 Mon Sep 17 00:00:00 2001 From: Josh Cooper Date: Sat, 28 Aug 2021 12:45:17 -0700 Subject: [PATCH] Modifies EventManager::registerTick to retain old behaviour of re-registering tick events --- library/modules/EventManager.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/library/modules/EventManager.cpp b/library/modules/EventManager.cpp index c21ffc933..f4838b192 100644 --- a/library/modules/EventManager.cpp +++ b/library/modules/EventManager.cpp @@ -91,7 +91,10 @@ int32_t DFHack::EventManager::registerTick(EventHandler handler, int32_t when, P handler.when = when; tickQueue.insert(pair(handler.when, handler)); eventLastTick[handler.eventHandler] = -1; - handlers[EventType::TICK].insert(pair(plugin,handler)); + //this commented line ensures "Registered Ticks" are not added back to the queue after execution + //handlers[EventType::TICK].insert(pair(plugin,handler)); + + // since the event isn't added to the handlers, we don't need to unregister these events return when; }