From ad75cb07543b9524f00d98f484b4c03c9f4216ea Mon Sep 17 00:00:00 2001
From: Ted John <ted@brambles.org>
Date: Fri, 24 Apr 2020 13:24:26 +0100
Subject: [PATCH] Update src/openrct2/scripting/ScriptEngine.cpp
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-Authored-By: Breno Rodrigues Guimarães <brenorg@gmail.com>
---
 src/openrct2/scripting/ScriptEngine.cpp | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

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