Skip to content

Commit 2c6416a

Browse files
committed
Standarize newlines inbetween blocks across mtasa-resources
1 parent a3215d8 commit 2c6416a

File tree

107 files changed

+3810
-3932
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

107 files changed

+3810
-3932
lines changed

[admin]/acpanel/c_gui_block_mods.lua

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
--
66

77

8-
98
function aBlockModsTab.Create ( tab )
109
aBlockModsTab.Tab = tab
1110

[admin]/acpanel/c_gui_config.lua

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
--
66

77

8-
98
function aServerConfigTab.Create ( tab )
109
aServerConfigTab.Tab = tab
1110

@@ -44,7 +43,6 @@ function aServerConfigTab.Create ( tab )
4443
ypos = ypos + 240
4544

4645

47-
4846
---------------------------------------------------------
4947
-- acpanel version alert
5048
---------------------------------------------------------

[admin]/acpanel/s_main.lua

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,6 @@ function doesResourceHasPermissions()
122122
end
123123

124124

125-
126125
--------------------------------------------------------------------
127126
-- Check player can do stuff
128127
--------------------------------------------------------------------

[admin]/acpanel/s_settings.lua

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,6 @@ function setPanelSetting(name, value)
8181
end
8282

8383

84-
8584
---------------------------------------------------------
8685
-- Enforce min client override
8786
---------------------------------------------------------

[admin]/admin/client/gui/admin_inputbox.lua

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,6 @@ function aInputBoxClick ( button )
205205
end
206206

207207

208-
209208
--
210209
-- Ban input box
211210
--
@@ -282,7 +281,6 @@ function aBanInputBox ( player )
282281
y = y + 30
283282

284283

285-
286284
guiSetSize ( aBanInputForm, guiGetSize ( aBanInputForm, false ), y, false )
287285

288286
guiSetProperty ( aBanInputForm, "AlwaysOnTop", "true" )
@@ -384,7 +382,6 @@ function aBanInputBoxFinish ()
384382
triggerServerEvent ( "aPlayer", localPlayer, aBanInputPlayer, "ban", reason, seconds, bUseSerial )
385383

386384

387-
388385
-- Clear input
389386
guiSetText ( aBanInputValue, "" )
390387
for i,dur in ipairs(aBanDurations) do
@@ -393,9 +390,6 @@ function aBanInputBoxFinish ()
393390
end
394391

395392

396-
397-
398-
399393
--
400394
-- Mute input box
401395
--

[admin]/admin/client/gui/admin_main.lua

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -680,8 +680,6 @@ return false
680680
end
681681

682682

683-
684-
685683
function aClientGUITabSwitched( selectedTab )
686684
if getElementParent( selectedTab ) == aTabPanel then
687685
if selectedTab == aTab2.Tab then

[admin]/admin/meta.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,7 @@
269269
<file src="client/images/flags/ve.png" />
270270
<file src="client/images/flags/hr.png" />
271271
<file src="client/images/flags/xk.png" />
272-
272+
273273
<!--Unused-->
274274
<!--
275275
<script src="server/admin_community.lua" />

[admin]/admin/server/admin_ip2c.lua

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,6 @@ ByteBuffer = {
157157
}
158158

159159

160-
161160
-- Make a stream of absolute numbers relative to each other
162161
local relPos = 0
163162
function relPosReset()

[admin]/admin/server/admin_sync.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -429,7 +429,7 @@ addEventHandler("onResourceStart", resourceRoot,
429429
end
430430
)
431431

432-
addEventHandler( "onPlayerJoin", root,
432+
addEventHandler( "onPlayerJoin", root,
433433
function()
434434
_playerModInfo[source] = {}
435435
end

[admin]/admin2/admin_coroutines.lua

Lines changed: 49 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -6,52 +6,52 @@
66
*
77
* Original File by lil_Toady
88
*
9-
**************************************]]
10-
local aCoroutines = {}
11-
12-
sourceCoroutine = nil
13-
14-
local _addEventHandler = addEventHandler
15-
function addEventHandler(event, element, handler, ...)
16-
if (not _addEventHandler(event, element, corouteHandler(handler), ...)) then
17-
local info = debug.getinfo(2, "nS")
18-
outputDebugString("addEventHandler call failed from: " .. tostring(info.name) .. " (" .. info.short_src .. ")")
19-
end
20-
end
21-
22-
local _removeEventHandler = removeEventHandler
23-
function removeEventHandler(event, element, handler)
24-
if (aCoroutines[handler]) then
25-
for id, wrapper in ipairs(aCoroutines[handler]) do
26-
_removeEventHandler(event, element, wrapper)
27-
end
28-
aCoroutines[handler] = {}
29-
else
30-
_removeEventHandler(event, element, handler)
31-
end
32-
end
33-
34-
function corouteHandler(handler)
35-
local wrapper = function(...)
36-
local c = coroutine.create(handler)
37-
sourceCoroutine = c
38-
local result, error = coroutine.resume(c, ...)
39-
if (not result) then
40-
outputDebugString(tostring(error))
41-
end
42-
if (sourceCoroutine == c) then
43-
sourceCoroutine = nil
44-
end
45-
end
46-
if (not aCoroutines[handler]) then
47-
aCoroutines[handler] = {}
48-
end
49-
table.insert(aCoroutines[handler], wrapper)
50-
return wrapper
51-
end
52-
53-
function coroutineKill(cr)
54-
if (coroutine.status(c) ~= "dead") then
55-
coroutine.resume(c, nil)
56-
end
57-
end
9+
**************************************]]
10+
local aCoroutines = {}
11+
12+
sourceCoroutine = nil
13+
14+
local _addEventHandler = addEventHandler
15+
function addEventHandler(event, element, handler, ...)
16+
if (not _addEventHandler(event, element, corouteHandler(handler), ...)) then
17+
local info = debug.getinfo(2, "nS")
18+
outputDebugString("addEventHandler call failed from: " .. tostring(info.name) .. " (" .. info.short_src .. ")")
19+
end
20+
end
21+
22+
local _removeEventHandler = removeEventHandler
23+
function removeEventHandler(event, element, handler)
24+
if (aCoroutines[handler]) then
25+
for id, wrapper in ipairs(aCoroutines[handler]) do
26+
_removeEventHandler(event, element, wrapper)
27+
end
28+
aCoroutines[handler] = {}
29+
else
30+
_removeEventHandler(event, element, handler)
31+
end
32+
end
33+
34+
function corouteHandler(handler)
35+
local wrapper = function(...)
36+
local c = coroutine.create(handler)
37+
sourceCoroutine = c
38+
local result, error = coroutine.resume(c, ...)
39+
if (not result) then
40+
outputDebugString(tostring(error))
41+
end
42+
if (sourceCoroutine == c) then
43+
sourceCoroutine = nil
44+
end
45+
end
46+
if (not aCoroutines[handler]) then
47+
aCoroutines[handler] = {}
48+
end
49+
table.insert(aCoroutines[handler], wrapper)
50+
return wrapper
51+
end
52+
53+
function coroutineKill(cr)
54+
if (coroutine.status(c) ~= "dead") then
55+
coroutine.resume(c, nil)
56+
end
57+
end

0 commit comments

Comments
 (0)