From e094ed41aaf661a85c6081b17191dcd77a55e5f9 Mon Sep 17 00:00:00 2001
From: jenz <unlozehq@gmail.com>
Date: Thu, 23 Mar 2023 22:25:20 +0100
Subject: [PATCH] removed unnecesary parameter, not sure if map being incorrect
 parameter type is fixed doe

---
 .../scripting/mapchooser_extended.sp          | 39 ++++++-------------
 .../scripting/nominations_extended.sp         |  2 +-
 2 files changed, 12 insertions(+), 29 deletions(-)

diff --git a/mapchooser_extended/scripting/mapchooser_extended.sp b/mapchooser_extended/scripting/mapchooser_extended.sp
index 75d58f97..6f7fa938 100755
--- a/mapchooser_extended/scripting/mapchooser_extended.sp
+++ b/mapchooser_extended/scripting/mapchooser_extended.sp
@@ -230,7 +230,6 @@ public void OnPluginEnd()
             Call_StartForward(g_NominationsResetForward);
             GetArrayString(g_NominateList[i], j, oldmap, PLATFORM_MAX_PATH);
             Call_PushString(oldmap);
-            Call_PushCell(GetArrayCell(g_NominateOwners, index));
             Call_Finish();
         }
     }
@@ -622,7 +621,6 @@ public void OnClientDisconnect(int client)
         char oldmap[PLATFORM_MAX_PATH];
         GetArrayString(g_NominateList[client], i, oldmap, PLATFORM_MAX_PATH);
         Call_PushString(oldmap);
-        Call_PushCell(GetArrayCell(g_NominateOwners, index));
         Call_Finish();
     }
 
@@ -1242,14 +1240,9 @@ void InitiateVote(MapChange when, Handle inputlist=INVALID_HANDLE)
             RemoveStringFromArray(g_NextMapList, map);
 
             /* Notify Nominations that this map is now free */
-            //2023-03-23 edit to prevent index going out of range
-            if (GetArraySize(g_NominateOwners) > i)
-            {
-                Call_StartForward(g_NominationsResetForward);
-                Call_PushString(map);
-                Call_PushCell(GetArrayCell(g_NominateOwners, i));
-                Call_Finish();
-            }
+            Call_StartForward(g_NominationsResetForward);
+            Call_PushString(map);
+            Call_Finish();
         }
 
         /* Clear out the rest of the nominations array */
@@ -1260,14 +1253,9 @@ void InitiateVote(MapChange when, Handle inputlist=INVALID_HANDLE)
             /* These maps shouldn't be excluded from the vote as they weren't really nominated at all */
 
             /* Notify Nominations that this map is now free */
-            //2023-03-23 edit to prevent index going out of range
-            if (GetArraySize(g_NominateOwners) > i)
-            {
-                Call_StartForward(g_NominationsResetForward);
-                Call_PushString(map);
-                Call_PushCell(GetArrayCell(g_NominateOwners, i));
-                Call_Finish();
-            }
+            Call_StartForward(g_NominationsResetForward);
+            Call_PushString(map);
+            Call_Finish();
         }
 
         /* There should currently be 'nominationsToAdd' unique maps in the vote */
@@ -1845,7 +1833,6 @@ NominateResult InternalNominateMap(char[] map, int owner)
         GetArrayString(g_NominateList[owner], 0, oldmap, PLATFORM_MAX_PATH);
         Call_StartForward(g_NominationsResetForward);
         Call_PushString(oldmap);
-        Call_PushCell(owner);
         Call_Finish();
 
         RemoveFromArray(g_NominateList[owner], 0);
@@ -1890,7 +1877,6 @@ NominateResult InternalNominateMap(char[] map, int owner)
         Call_StartForward(g_NominationsResetForward);
         Call_PushString(oldmap);
         int owner_ = GetArrayCell(g_NominateOwners, 0);
-        Call_PushCell(owner_);
         Call_Finish();
 
         RemoveFromArray(g_NominateList[owner], 0);
@@ -1934,7 +1920,6 @@ bool InternalRemoveNominationByMap(char[] map)
             {
                 Call_StartForward(g_NominationsResetForward);
                 Call_PushString(oldmap);
-                Call_PushCell(GetArrayCell(g_NominateOwners, i));
                 Call_Finish();
 
                 int owner = GetArrayCell(g_NominateOwners, i);
@@ -1979,7 +1964,6 @@ bool InternalRemoveNominationByOwner(int owner)
 
 		Call_StartForward(g_NominationsResetForward);
 		Call_PushString(oldmap);
-		Call_PushCell(owner);
 		Call_Finish();
 
 		RemoveFromArray(g_NominateList[owner], index);
@@ -2628,17 +2612,16 @@ void CheckMapRestrictions(bool time = false, bool players = false)
 
             if (remove)
             {
-                if (GetArraySize(g_NominateOwners) > i)
+                if (strlen(map) > 0)
                 {
                     Call_StartForward(g_NominationsResetForward);
                     Call_PushString(map);
-                    Call_PushCell(GetArrayCell(g_NominateOwners, i));
                     Call_Finish();
-
-                    RemoveFromArray(g_NominateList[client], i);
-                    RemoveFromArray(g_NominateOwners, i);
-                    g_NominateCount--;
                 }
+
+                RemoveFromArray(g_NominateList[client], i);
+                RemoveFromArray(g_NominateOwners, i);
+                g_NominateCount--;
             }
         }
     }
diff --git a/mapchooser_extended/scripting/nominations_extended.sp b/mapchooser_extended/scripting/nominations_extended.sp
index c24152dc..2c38eabe 100755
--- a/mapchooser_extended/scripting/nominations_extended.sp
+++ b/mapchooser_extended/scripting/nominations_extended.sp
@@ -234,7 +234,7 @@ void UpdateMapTrie()
 		delete excludeMaps;
 }
 
-public void OnNominationRemoved(const char[] map, int owner)
+public void OnNominationRemoved(const char[] map)
 {
     int status;
     /* Is the map in our list? */