Fix NamalskEvents and use GetNamEventManager API

VanillaPlusPlus · Oct 1, 2023 · 6b2bef2 · 6b2bef2
1 parent 02bbfa3
commit 6b2bef2
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/4_World/VPPAdminTools/Plugins/PluginBase/ChatCommandManager/ChatCommandManager.c b/4_World/VPPAdminTools/Plugins/PluginBase/ChatCommandManager/ChatCommandManager.c
@@ -19,7 +19,7 @@ class ChatCommandManager : PluginBase
 		AddChatCommand(new ReturnPlayerChatModule("/return",1,"Chat:ReturnPlayer", true));
 		AddChatCommand(new GotoPlayerChatModule("/goto", 1, "Chat:GotoPlayer", true));
 
-		if (VPPAT_IsModLoadded("NamalskSurvival"))
+		if (VPPAT_IsModLoadded("Namalsk_Survival"))
 		{
 			AddChatCommand(new NamalskEvents("/runevent", 1, "Chat:NamalskRunEvent"));
 		}

diff --git a/...s/PluginBase/ChatCommandManager/Classes/ChatModules/ArgumentCommands/Misc/NamalskEvents.c b/...s/PluginBase/ChatCommandManager/Classes/ChatModules/ArgumentCommands/Misc/NamalskEvents.c
@@ -3,15 +3,13 @@ class NamalskEvents extends ChatCommand
 	override void ExecuteCommand(PlayerBase caller, array<Man> targets, array<string> args)
     {
         if(caller == null) return;
-
-		Mission ms = GetGame().GetMission();
-		Class eventManager;
-		EnScript.GetClassVar(ms, "m_EventManagerServer", 0, eventManager);
-
 		string eventTypeStr = args[0];
 		typename eventType = eventTypeStr.ToType();
 		if (eventType && eventType.IsInherited(String("NamEventBase").ToType()))
 		{
+			Class eventManager;
+			GetGame().GameScript.CallFunction(GetGame().GetMission(), "GetNamEventManager", eventManager, null);
+
 			bool isRunning;
 			GetGame().GameScript.CallFunction(eventManager, "IsEventActive", isRunning, eventType);
 			if (isRunning)

diff --git a/5_Mission/VPPAdminTools/GUI/SubMenus/MenuCommandsConsole/MenuCommandsConsole.c b/5_Mission/VPPAdminTools/GUI/SubMenus/MenuCommandsConsole/MenuCommandsConsole.c
@@ -37,7 +37,7 @@ class MenuCommandsConsole: AdminHudSubMenu
 		m_CmdTooltips.Insert("/kill", new Param2<string,string>("#VSTR_TOOLTIP_KILL", "<PlayerName> OR self"));
 		m_CmdTooltips.Insert("/strip", new Param2<string,string>("#VSTR_TOOLTIP_STRIP", "<PlayerName> OR self"));
 		m_CmdTooltips.Insert("/clear", new Param2<string,string>("#VSTR_TOOLTIP_CLEAR", ""));
-		if (VPPAT_IsModLoadded("NamalskSurvival")){
+		if (VPPAT_IsModLoadded("Namalsk_Survival")){
 			m_CmdTooltips.Insert("/runevent", new Param2<string,string>("Force start a Namalsk global event, types of events from init.c", "/runevent EVRStorm"));
 		}
 	}