Merge pull request #963 from arieshi255/fix-lut

[3.x] Throw exception if duplicate definitions of actions are found
SapphireServer · Jun 27, 2024 · 2a0e423 · 2a0e423
2 parents 88ae073 + e2e6b3e
commit 2a0e423
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/src/world/Action/ActionLutData.cpp b/src/world/Action/ActionLutData.cpp
@@ -3,6 +3,7 @@
 #include <fstream>
 #include <filesystem>
 #include <iostream>
+#include <Logging/Logger.h>
 
 using namespace Sapphire;
 using namespace Sapphire::World::Action;
@@ -138,6 +139,10 @@ bool ActionLutData::cacheActions()
       {
         auto id = std::stoi( i.key() );
         auto action = i.value().get< ActionEntry >();
+
+        if( ActionLut::m_actionLut.count( id ) > 0 )
+          throw std::runtime_error( fmt::format( "Action with ID {} cannot be defined more than once (defined again in {})", i.key(), p.path().string() ) );
+
         ActionLut::m_actionLut.try_emplace( id, action );
       }