From 6d3edfa545c9df30baa6685b94aa07b29069e04c Mon Sep 17 00:00:00 2001
From: Anton Tarasenko <dkanus@gmail.com>
Date: Mon, 18 Jul 2022 04:37:37 +0700
Subject: [PATCH] Fix `ServerUnrealAPI` not using base API classes

---
 .../BaseImplementation/EKFInventory.uc           |  2 +-
 .../API/Unreal/ServerUnrealAPIBase.uc            | 16 ++++++++--------
 sources/ServerRealm/ServerGlobal.uc              |  2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/sources/Gameplay/KF1Frontend/BaseImplementation/EKFInventory.uc b/sources/Gameplay/KF1Frontend/BaseImplementation/EKFInventory.uc
index cff004b..257bff0 100644
--- a/sources/Gameplay/KF1Frontend/BaseImplementation/EKFInventory.uc
+++ b/sources/Gameplay/KF1Frontend/BaseImplementation/EKFInventory.uc
@@ -241,7 +241,7 @@ private function KFWeapon GetByRootWithDualRole(
     Inventory                       inventoryChain,
     InventoryAPI.DualWieldingRole   requiredRole)
 {
-    local InventoryAPI          api;
+    local InventoryAPIBase  api;
     local class<KFWeapon>       nextWeaponClass;
     local class<KFWeaponPickup> itemRoot, nextRoot;
     api = _server.unreal.inventory;
diff --git a/sources/ServerRealm/API/Unreal/ServerUnrealAPIBase.uc b/sources/ServerRealm/API/Unreal/ServerUnrealAPIBase.uc
index 5c13cfb..01bec57 100644
--- a/sources/ServerRealm/API/Unreal/ServerUnrealAPIBase.uc
+++ b/sources/ServerRealm/API/Unreal/ServerUnrealAPIBase.uc
@@ -23,10 +23,10 @@ class ServerUnrealAPIBase extends UnrealAPIBase
 
 var protected bool initialized;
 
-var public MutatorAPI   mutator;
-var public GameRulesAPI gameRules;
-var public BroadcastAPI broadcasts;
-var public InventoryAPI inventory;
+var public MutatorAPIBase   mutator;
+var public GameRulesAPIBase gameRules;
+var public BroadcastAPIBase broadcasts;
+var public InventoryAPIBase inventory;
 
 public function Initialize(class<ServerAcediaAdapter> adapterClass)
 {
@@ -37,13 +37,13 @@ public function Initialize(class<ServerAcediaAdapter> adapterClass)
     if (adapterClass == none) {
         return;
     }
-    mutator     = MutatorAPI(_.memory.Allocate(
+    mutator     = MutatorAPIBase(_.memory.Allocate(
         adapterClass.default.serverMutatorAPIClass));
-    gameRules   = GameRulesAPI(_.memory.Allocate(
+    gameRules   = GameRulesAPIBase(_.memory.Allocate(
         adapterClass.default.serverGameRulesAPIClass));
-    broadcasts  = BroadcastAPI(_.memory.Allocate(
+    broadcasts  = BroadcastAPIBase(_.memory.Allocate(
         adapterClass.default.serverBroadcastAPIClass));
-    inventory   = InventoryAPI(_.memory.Allocate(
+    inventory   = InventoryAPIBase(_.memory.Allocate(
         adapterClass.default.serverInventoryAPIClass));
 }
 
diff --git a/sources/ServerRealm/ServerGlobal.uc b/sources/ServerRealm/ServerGlobal.uc
index 8354eb3..2c8dad4 100644
--- a/sources/ServerRealm/ServerGlobal.uc
+++ b/sources/ServerRealm/ServerGlobal.uc
@@ -64,7 +64,7 @@ protected function Initialize()
         return;
     }
     _ = class'Global'.static.GetInstance();
-    unreal  = ServerUnrealAPI(
+    unreal  = ServerUnrealAPIBase(
         _.memory.Allocate(serverAdapterClass.default.serverUnrealAPIClass));
     unreal.Initialize(serverAdapterClass);
     time    = ServerTimeAPI(