Fix all empty if branches

ArranTuna · ArranTuna · commit 2660580de275 · 2021-11-17T18:52:41.000Z
diff --git a/[admin]/admin/client/gui/admin_main.lua b/[admin]/admin/client/gui/admin_main.lua
@@ -995,7 +995,7 @@ function aClientClick ( button )
 				aViewMessages()
 			elseif ( source == aTab1.ScreenShots ) then
 				aPlayerScreenShot()
-			elseif ( source == aTab1.PlayerListSearch ) then
+			--elseif ( source == aTab1.PlayerListSearch ) then
 
 			elseif ( source == aTab1.HideColorCodes ) then
 				setHideColorCodes ( guiCheckBoxGetSelected ( aTab1.HideColorCodes ) )
@@ -1049,9 +1049,7 @@ function aClientClick ( button )
 			end
 		-- TAB 2, RESOURCES
 		elseif ( getElementParent ( source ) == aTab2.Tab ) then
-			if ( source == aTab2.ResourceListSearch ) then
-
-			elseif ( ( source == aTab2.ResourceStart ) or ( source == aTab2.ResourceRestart ) or ( source == aTab2.ResourceStop ) or ( source == aTab2.ResourceDelete ) or ( source == aTab2.ResourceSettings ) ) then
+			if ( ( source == aTab2.ResourceStart ) or ( source == aTab2.ResourceRestart ) or ( source == aTab2.ResourceStop ) or ( source == aTab2.ResourceDelete ) or ( source == aTab2.ResourceSettings ) ) then
 				if ( guiGridListGetSelectedItem ( aTab2.ResourceList ) == -1 ) then
 					aMessageBox ( "error", "No resource selected!" )
 				else
@@ -1165,7 +1163,7 @@ function aClientClick ( button )
 					else triggerServerEvent ( "aAdminChat", localPlayer, message ) end
 					guiSetText ( aTab5.AdminText, "" )
 				end
-			elseif ( source == aTab5.AdminText ) then
+			--elseif ( source == aTab5.AdminText ) then
 
 			end
 		-- TAB 6, OPTIONS
@@ -1186,11 +1184,11 @@ function aClientClick ( button )
 				aPerformance()
 			elseif ( source == aTab6.AutoLogin ) then
 				triggerServerEvent ( "aAdmin", localPlayer, "autologin", guiCheckBoxGetSelected ( aTab6.AutoLogin ) )
-			elseif ( source == aTab6.PasswordOld ) then
+			--elseif ( source == aTab6.PasswordOld ) then
 
-			elseif ( source == aTab6.PasswordNew ) then
+			--elseif ( source == aTab6.PasswordNew ) then
 
-			elseif ( source == aTab6.PasswordConfirm ) then
+			--elseif ( source == aTab6.PasswordConfirm ) then
 
 			elseif ( source == aTab6.PasswordChange ) then
 				local passwordNew, passwordConf = guiGetText ( aTab6.PasswordNew ), guiGetText ( aTab6.PasswordConfirm )
diff --git a/[admin]/admin/client/gui/admin_maps.lua b/[admin]/admin/client/gui/admin_maps.lua
@@ -62,9 +62,7 @@ addEventHandler("getMaps_c", getLocalPlayer(), loadMaps)
 function guiClick(button)
 	if button == "left" then
 		if ( getElementParent ( source ) == aTabMap.Tab ) then
-			if source == aTabMap.MapListSearch then
-
-			elseif source == aTabMap.RefreshList then
+			if source == aTabMap.RefreshList then
 				guiGridListClear(aTabMap.MapList)
 				triggerServerEvent("getMaps_s", getLocalPlayer(), true)
 			end
diff --git a/[admin]/admin/client/gui/admin_report.lua b/[admin]/admin/client/gui/admin_report.lua
@@ -157,9 +157,9 @@ function aClientReportClick ( button )
 				triggerServerEvent ( "aMessage", getLocalPlayer(), "new", tableOut )
 				aReportClose ()
 			end
-		elseif ( source == aReportSubject ) then
+		--elseif ( source == aReportSubject ) then
 
-		elseif ( source == aReportMessage ) then
+		--elseif ( source == aReportMessage ) then
 
 		elseif ( source == aReportCancel ) then
 			aReportClose ()
diff --git a/[admin]/admin/client/gui/admin_team.lua b/[admin]/admin/client/gui/admin_team.lua
@@ -100,7 +100,7 @@ function aClientTeamClick ( button )
 				aNewTeamShow ( false )
 			end
 			setTimer ( aTeamsRefresh, 2000, 1 )
-		elseif ( source == aTeamName ) then
+		--elseif ( source == aTeamName ) then
 
 		elseif ( source == aTeamCancel ) then
 			aNewTeamShow ( false )
diff --git a/[admin]/admin/server/admin_server.lua b/[admin]/admin/server/admin_server.lua
@@ -619,7 +619,7 @@ addEventHandler ( "aAdmin", _root, function ( action, ... )
 				outputChatBox ( "Error - Invalid password.", source, 255, 0, 0 )
 			end
 		end
-	elseif ( action == "autologin" ) then
+	--elseif ( action == "autologin" ) then
 
 	elseif ( action == "settings" ) then
 		local cmd = arg[1]
diff --git a/[admin]/admin2/client/main/admin_network.lua b/[admin]/admin2/client/main/admin_network.lua
@@ -17,6 +17,6 @@ function aNetworkTab.Create(tab)
 end
 
 function aNetworkTab.onClientClick(button)
-    if (button == "left") then
-    end
+    --if (button == "left") then
+    --end
 end
diff --git a/[admin]/admin2/server/admin_ACL.lua b/[admin]/admin2/server/admin_ACL.lua
@@ -197,9 +197,6 @@ local aACLFunctions = {
     [ACL_RESOURCES] = function()
     end,
     [ACL_ACL] = function(action, group)
-        if (action == ACL_ADD) then
-        elseif (action == ACL_REMOVE) then
-        end
         local data = {}
         for id, acl in ipairs(aclGroupListACL(aclGetGroup(group))) do
             local storage = {}
@@ -243,7 +240,6 @@ function moo()
                 outputChatBox("Error - Invalid password.", source, 255, 0, 0)
             end
         end
-    elseif (action == "autologin") then
     elseif (action == "sync") then
         local type = arg[1]
         local tableOut = {}
diff --git a/[admin]/admin2/server/admin_network.lua b/[admin]/admin2/server/admin_network.lua
@@ -218,8 +218,5 @@ addEventHandler(
     "onPlayerChat",
     getRootElement(),
     function(message, type)
-        if (type == 0) then
-        elseif (type == 1) then
-        end
     end
 )
diff --git a/[admin]/admin2/server/admin_screenshot.lua b/[admin]/admin2/server/admin_screenshot.lua
@@ -36,9 +36,6 @@ addEventHandler(
     EVENT_SCREEN_SHOT,
     root,
     function(action, id, ...)
-        if (action == SCREENSHOT_SAVE) then
-        elseif (action == SCREENSHOT_DELETE) then
-        end
     end
 )
 
diff --git a/[editor]/move_freecam/move_freecam.lua b/[editor]/move_freecam/move_freecam.lua
@@ -52,9 +52,7 @@ end
 local function getCoordsWithBoundingBox(origX, origY, origZ)
 	if (not collisionless) then
 		local newX, newY, newZ = origX, origY, origZ
-		if (not ignoreElementWalls) then
-			-- hard stuff
-		else
+		if (ignoreElementWalls) then
 			local surfaceFound, surfaceX, surfaceY, surfaceZ, element = processLineOfSight(origX, origY, origZ + SURFACE_ERROR_CORRECTION_OFFSET, origX, origY, origZ + minZ, true, true, true, true, true, true, false, true, selectedElement)
 			if (surfaceFound) then
 				newZ = surfaceZ + centerToBaseDistance
diff --git a/[gamemodes]/[assault]/[maps]/as-heist/as-heist.lua b/[gamemodes]/[assault]/[maps]/as-heist/as-heist.lua
@@ -597,7 +597,7 @@ function checkObjective ( obj, players )
 	elseif ( obj.id == "park" ) then
 		scriptEndPark()
 		setTimer ( scriptRemovePark, 1000, 1 )
-	elseif ( obj.id == "casino" ) then
+	--elseif ( obj.id == "casino" ) then
 		--scriptRemoveCasino() -- leaving the entrance open
 	elseif ( obj.id == "key" ) then
 		setTimer ( scriptRemoveKey, 1000, 1 )
diff --git a/[gamemodes]/[assault]/assault/assault_client.lua b/[gamemodes]/[assault]/assault/assault_client.lua
@@ -34,10 +34,6 @@ function createGui(options)
 		justCreated = true
 	end
 
-	if (assaultGui == nil) then
-		--outputDebugString("test")
-	end
-
 	-- TAB: Map Information
 
 	if (justCreated) then
diff --git a/[gamemodes]/[briefcaserace]/[maps]/br-sf-autoteams/mapstuff.lua b/[gamemodes]/[briefcaserace]/[maps]/br-sf-autoteams/mapstuff.lua
@@ -15,13 +15,15 @@ function isVehicleIDBlocked ( id )
 	return blocked
 end
 
+--[[
 addEventHandler("onVehicleStartEnter", root,
 function (player, seat, jacked, door)
 	if (isVehicleIDBlocked(getElementModel(source))) then
 		-- blah blah blah
 	end
 end
 )
+]]--
 
 addCommandHandler("kill",
 function (player, commandName)
diff --git a/[gamemodes]/[briefcaserace]/[maps]/br-sf-teams/mapstuff.lua b/[gamemodes]/[briefcaserace]/[maps]/br-sf-teams/mapstuff.lua
@@ -15,13 +15,15 @@ function isVehicleIDBlocked ( id )
 	return blocked
 end
 
+--[[
 addEventHandler("onVehicleStartEnter", root,
 function (player, seat, jacked, door)
 	if (isVehicleIDBlocked(getElementModel(source))) then
 		-- blah blah blah
 	end
 end
 )
+]]--
 
 addCommandHandler("kill",
 function (player, commandName)
diff --git a/[gamemodes]/[briefcaserace]/[maps]/br-sf/mapstuff.lua b/[gamemodes]/[briefcaserace]/[maps]/br-sf/mapstuff.lua
@@ -15,13 +15,15 @@ function isVehicleIDBlocked ( id )
 	return blocked
 end
 
+--[[
 addEventHandler("onVehicleStartEnter", root,
 function (player, seat, jacked, door)
 	if (isVehicleIDBlocked(getElementModel(source))) then
 		-- blah blah blah
 	end
 end
 )
+]]--
 
 addCommandHandler("kill",
 function (player, commandName)
diff --git a/[gamemodes]/[briefcaserace]/briefcaserace/server/br.server.game.lua b/[gamemodes]/[briefcaserace]/briefcaserace/server/br.server.game.lua
@@ -206,7 +206,7 @@ function endGame(showScores, tellMapCycler)
 		removeReadyPlayer(v)
 	end
 
-	if (showScores) then
+	--if (showScores) then
 		--[[forceScoreboardForAllPlayers(true)
 		setTimer(forceScoreboardForAllPlayers, 10000, 1, false)
 		addEventHandler("onResourceStop", getResourceRootElement(getThisResource()), onStopSetScoreboardNotForced)
@@ -216,7 +216,7 @@ function endGame(showScores, tellMapCycler)
 --			setTimer(outputConsole, 9000, 1, "[Gamemode finished]")
 --			setTimer(call, 10000, 1, mapmanagerResource, "stopGamemode") -- server crashes?
 --		end
-	end
+	--end
 
 	if (tellMapCycler) then
 		local mapCyclerResource = getResourceFromName("mapcycler")
diff --git a/[gamemodes]/[race]/[addons]/race_ghost/playback_client.lua b/[gamemodes]/[race]/[addons]/race_ghost/playback_client.lua
@@ -128,9 +128,7 @@ function GhostPlayback:updateGhostState()
 	setElementHealth( self.ped, 100 ) -- we don't want the ped to die
 	while (self.recording[self.currentIndex] and self.recording[self.currentIndex].t < ticks) do
 		local theType = self.recording[self.currentIndex].ty
-		if theType == "st" then
-			-- Skip
-		elseif theType == "po" then
+		if theType == "po" then
 			local x, y, z = self.recording[self.currentIndex].x, self.recording[self.currentIndex].y, self.recording[self.currentIndex].z
 			local rX, rY, rZ = self.recording[self.currentIndex].rX, self.recording[self.currentIndex].rY, self.recording[self.currentIndex].rZ
 			local vX, vY, vZ = self.recording[self.currentIndex].vX, self.recording[self.currentIndex].vY, self.recording[self.currentIndex].vZ
diff --git a/[gamemodes]/[race]/[addons]/race_toptimes/toptimes_client.lua b/[gamemodes]/[race]/[addons]/race_toptimes/toptimes_client.lua
@@ -356,7 +356,7 @@ function CToptimes:updateShow()
 	if not bShowAny then
 		self.targetFade = 0
 	elseif not self.bManualShow and self.listStatus ~= 'Full' then
-		-- No change
+		return true -- No change
 	else
 		local bShowLoading	= self.listStatus=='Loading'
 		local bShowTimes	= self.listStatus=='Full'
diff --git a/[gamemodes]/[stealth]/stealth/gadgets_client.lua b/[gamemodes]/[stealth]/stealth/gadgets_client.lua
@@ -473,9 +473,7 @@ function shieldingyet ()
 	if isElementInWater(getLocalPlayer()) == false then
 		if sheildon ~= 1 then
 			currenttask = getPedSimplestTask ( getLocalPlayer() )
-			if notblockingTasks[currenttask] then
-	--			NO SHIELD APPEARS
-			else
+			if not notblockingTasks[currenttask] then
 				killTimer ( blockcheck )
 				blockcheck = nil
 				shieldon = 1
diff --git a/[gamemodes]/[stealth]/stealth/mission_timer.lua b/[gamemodes]/[stealth]/stealth/mission_timer.lua
@@ -146,10 +146,7 @@ function missionTimerTick()
 					triggerEvent ( "missionTimerActivated", misTmrRoot, tostring(theTimer["id"]), theTimer["player"] )
 					theTimer["started"] = false
 				end
-			elseif ( theTimer["direction"] == ">" ) then
-				--Counting Up
-
-			else
+			elseif ( theTimer["direction"] ~= ">" ) then
 				--Set a default value of Down.
 				theTimer["direction"] = "<"
 			end
diff --git a/[gamemodes]/[tdm]/tdma/Additions/mission_timer.lua b/[gamemodes]/[tdm]/tdma/Additions/mission_timer.lua
@@ -154,9 +154,7 @@ function missionTimerTick()
 					triggerEvent ( "missionTimerActivated", misTmrRoot, tostring(theTimer["id"]), theTimer["player"] )
 					theTimer["started"] = false
 				end
-			elseif ( theTimer["direction"] == ">" ) then
-				--Counting up has yet to be coded
-			else
+			elseif ( theTimer["direction"] ~= ">" ) then
 				theTimer["direction"] = "<"
 			end
 		end
diff --git a/[gamemodes]/[tdm]/tdma/Main/Included/pickup_system.lua b/[gamemodes]/[tdm]/tdma/Main/Included/pickup_system.lua
@@ -50,7 +50,7 @@ function generatePickup ( pID )
 			pickups[pID]["pAmount"] = 100
 			pickups[pID]["pWeapon"] = 0
 			pickups[pID]["pAmmo"] = 0
-		else
+		--else
 			--outputDebugString ( "unable to create pickup ID " .. pID )
 		end
 	elseif ( pType == 1 ) then
@@ -62,7 +62,7 @@ function generatePickup ( pID )
 			pickups[pID]["pAmount"] = 100
 			pickups[pID]["pWeapon"] = 0
 			pickups[pID]["pAmmo"] = 0
-		else
+		--else
 			--outputDebugString ( "unable to create pickup ID " .. pID )
 		end
 	elseif ( pType >= 2 ) then
@@ -78,7 +78,7 @@ function generatePickup ( pID )
 				pickups[pID]["pAmount"] = 0
 				pickups[pID]["pWeapon"] = idWeapon
 				pickups[pID]["pAmmo"] = idAmmo
-			else
+			--else
 				--outputDebugString ( "unable to create pickup ID " .. pID )
 			end
 		else
@@ -105,7 +105,7 @@ function generatePickup ( pID )
 				pickups[pID]["pAmount"] = 0
 				pickups[pID]["pWeapon"] = idWeapon
 				pickups[pID]["pAmmo"] = WeaponAmmo
-			else
+			--else
 				--outputDebugString ( "unable to create pickup ID " .. pID )
 			end
 		end
diff --git a/[gameplay]/hedit/client/gui/guievents.lua b/[gameplay]/hedit/client/gui/guievents.lua
@@ -199,10 +199,6 @@ function onClick ( button, state )
                         setVehicleHandling ( pVehicle, property, string.reverse ( str ) )
 
 
-                    else
-
-                        -- No vehicle
-
                     end
 
                 end
@@ -285,9 +281,6 @@ function onEnter ( )
 
             guiSetInfoText ( getText ( "clickToEdit" ), getText ( "enterToSubmit" ) )
 
-        elseif inputType == "special" then
-
-
         end
 
     elseif parent == "special" then
@@ -368,10 +361,6 @@ function onEditBoxAccept ( box )
 
             prepareHandlingValue ( pVehicle, property, content )
 
-        else
-
-            -- when not vehicle
-
         end
 
     end
diff --git a/[gameplay]/hedit/server/cfgloader.lua b/[gameplay]/hedit/server/cfgloader.lua
@@ -119,9 +119,6 @@ function exportToDefaults ( linetabs )
 
                 local models = getVehicleModelsByIdentifier ( value )
 
-            else
-
-
             end
 
             local property = getHandlingPropertyFromID ( id )
diff --git a/[gameplay]/scoreboard/dxscoreboard_client.lua b/[gameplay]/scoreboard/dxscoreboard_client.lua
@@ -1107,8 +1107,7 @@ function scoreboardSortFunction( a, b )
 		end
 	end
 	if type( sortBy.dir ) == "number" then
-		if type( firstContent ) == type( secondContent ) then
-		else
+		if type( firstContent ) ~= type( secondContent ) then
 			firstContent = string.lower( tostring( firstContent ) )
 			secondContent = string.lower( tostring( secondContent ) )
 		end
diff --git a/[managers]/mapcycler/list_mode.lua b/[managers]/mapcycler/list_mode.lua
@@ -202,10 +202,10 @@ function outputNextMode(sourcePlayer)
 end
 
 function skipMap(sourcePlayer, command)
-	if not hasObjectPermissionTo(sourcePlayer, command, false) then
+	--if not hasObjectPermissionTo(sourcePlayer, command, false) then
 		--! deny access
 		--! return false
-	end
+	--end
 	outputCyclerDebugString("Map skipped by "..getPlayerName(sourcePlayer)) --! change to server log when security is added
 	cycleMap_list()
 end
diff --git a/[managers]/teammanager/main.lua b/[managers]/teammanager/main.lua
@@ -32,9 +32,9 @@ function handlePlayer ( player, teams, gamemodeName )
 end
 
 function autoBalance()
-	if get(autobalance_teams) then
+	--if get(autobalance_teams) then
 		--stuffs
-	end
+	--end
 end
 
 --A little hacky, check every 30 seconds for updated settings

Original file line number	Diff line number	Diff line change
`@@ -218,8 +218,5 @@ addEventHandler(`
`218`	`218`	`"onPlayerChat",`
`219`	`219`	`getRootElement(),`
`220`	`220`	`function(message, type)`
`221`		`- if (type == 0) then`
`222`		`- elseif (type == 1) then`
`223`		`- end`
`224`	`221`	`end`
`225`	`222`	`)`
Original file line number	Diff line number	Diff line change
`@@ -36,9 +36,6 @@ addEventHandler(`
`36`	`36`	`EVENT_SCREEN_SHOT,`
`37`	`37`	`root,`
`38`	`38`	`function(action, id, ...)`
`39`		`- if (action == SCREENSHOT_SAVE) then`
`40`		`- elseif (action == SCREENSHOT_DELETE) then`
`41`		`- end`
`42`	`39`	`end`
`43`	`40`	`)`
`44`	`41`