From 4ebd8da630ca8a3de8c888720a4b74bad52a429e Mon Sep 17 00:00:00 2001
From: Ted John <ted@brambles.org>
Date: Fri, 24 Apr 2020 13:38:27 +0100
Subject: [PATCH] Revert change to RemoveCustomGameActions

---
 src/openrct2/scripting/ScriptEngine.cpp | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/openrct2/scripting/ScriptEngine.cpp b/src/openrct2/scripting/ScriptEngine.cpp
index 5c93d7313a..84f997bdd4 100644
--- a/src/openrct2/scripting/ScriptEngine.cpp
+++ b/src/openrct2/scripting/ScriptEngine.cpp
@@ -821,8 +821,17 @@ bool ScriptEngine::RegisterCustomAction(
 
 void ScriptEngine::RemoveCustomGameActions(const std::shared_ptr<Plugin>& plugin)
 {
-    auto isOwner = [&] (auto& obj) { return obj.second.Owner == plugin; }
-    std::erase(std::remove_if(_customActions.begin(), _customActions.end(), isOwner), _customActions.end());
+    for (auto it = _customActions.begin(); it != _customActions.end();)
+    {
+        if (it->second.Owner == plugin)
+        {
+            it = _customActions.erase(it);
+        }
+        else
+        {
+            it++;
+        }
+    }
 }
 
 void ScriptEngine::RunGameActionHooks(const GameAction& action, std::unique_ptr<GameActionResult>& result, bool isExecute)