diff --git a/gamemodes/irresistible/cnr/commands/admin/admin_four.pwn b/gamemodes/irresistible/cnr/commands/admin/admin_four.pwn
index db0210c..95be870 100644
--- a/gamemodes/irresistible/cnr/commands/admin/admin_four.pwn
+++ b/gamemodes/irresistible/cnr/commands/admin/admin_four.pwn
@@ -147,7 +147,7 @@ CMD:resetwepall( playerid, params[ ] )
 
 		foreach(new pID : Player)
 		{
-		   	if ( !IsPlayerSpawned( pID ) || p_PlayerSettings[ pID ] { SETTING_EVENT_TP } )
+		   	if ( !IsPlayerSpawned( pID ) || ! IsPlayerSettingToggled( pID, SETTING_EVENT_TP ) )
 		   		continue;
 
 		   	if ( IsPlayerAFK( playerid ) )
@@ -184,7 +184,7 @@ CMD:giveweaponall( playerid, params[ ] )
 
 	    foreach(new pID : Player)
 	    {
-		   	if ( !IsPlayerSpawned( pID ) || IsPlayerJailed( pID ) || p_PlayerSettings[ pID ] { SETTING_EVENT_TP } )
+		   	if ( !IsPlayerSpawned( pID ) || IsPlayerJailed( pID ) || ! IsPlayerSettingToggled( pID, SETTING_EVENT_TP ) )
 		   		continue;
 
 		   	if ( IsPlayerAFK( playerid ) )
@@ -223,7 +223,7 @@ CMD:circleall( playerid, params[ ] )
 		GetPlayerPos( playerid, nX, nY, nZ );
 	    foreach(new i : Player)
 	    {
-	        if ( IsPlayerSpawned( i ) && i != playerid && !IsPlayerJailed( i ) && !p_PlayerSettings[ i ] { SETTING_EVENT_TP } )
+	        if ( IsPlayerSpawned( i ) && i != playerid && !IsPlayerJailed( i ) && IsPlayerSettingToggled( i, SETTING_EVENT_TP ) )
 	        {
 	        	if ( !allowcop && p_Class[ i ] == CLASS_POLICE )
 	        		continue;
diff --git a/gamemodes/irresistible/cnr/player_settings.pwn b/gamemodes/irresistible/cnr/player_settings.pwn
index da6cdaf..8e80dcd 100644
--- a/gamemodes/irresistible/cnr/player_settings.pwn
+++ b/gamemodes/irresistible/cnr/player_settings.pwn
@@ -29,7 +29,7 @@ enum E_SETTING_DATA {
 	bool: E_DEFAULT_VAL,		E_NAME[ 20 ]
 };
 
-new
+static stock
 	g_PlayerSettings 					[ ] [ E_SETTING_DATA ] = {
 		{ false, "Bail Offers" }, { false, "Event Teleports" }, { false, "Gang Invites" }, { false, "Chat Prefixes" }, { false, "Ransom Offers" },
 		{ false, "Auto-Save" }, { true, "Connection Log" }, { true, "Hitmarker" }, { true, "V.I.P Skin" }, { false, "Total Coin Bar" }, { false, "Last Donor Text" },