10000 Clean up · uramer/CoreScripts@1ff394c · GitHub
[go: up one dir, main page]
Skip to content

Commit 1ff394c

Browse files
urameruramer
committed
Clean up
1 parent a109a53 commit 1ff394c

File tree

4 files changed

+8
-10
lines changed

4 files changed

+8
-10
lines changed

‎scripts/customEventHooks.lua

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,13 @@ function customEventHooks.updateEventStatus(oldStatus, newStatus)
2020
else
2121
result.validDefaultHandler = oldStatus.validDefaultHandler
2222
end
23-
23+
2424
if newStatus.validCustomHandlers ~= nil then
2525
result.validCustomHandlers = newStatus.validCustomHandlers
2626
else
2727
result.validCustomHandlers = oldStatus.validCustomHandlers
2828
end
29-
29+
3030
return result
3131
end
3232

‎scripts/defaultCommands.lua

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -556,7 +556,6 @@ chatCommandHooks.registerCommand("kick", defaultCommands.kick)
556556
chatCommandHooks.setRankRequirement("kick", ranks.MODERATOR)
557557

558558
function defaultCommands.addAdmin(pid, cmd)
559-
tableHelper.print(cmd)
560559
if logicHandler.CheckPlayerValidity(pid, cmd[2]) then
561560
local targetPid = tonumber(cmd[2])
562561
local targetName = Players[targetPid].name

‎scripts/drive/postgres/thread.lua

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ function ProcessRequest(req)
4949
end
5050
end
5151
reconnectCounter = 0
52-
52+
5353
if type(cur) == "number" then
5454
return {
5555
log = req.sql,
@@ -69,7 +69,7 @@ function ProcessRequest(req)
6969
rows[i] = cur:fetch({}, modestring)
7070
end
7171
cur:close()
72-
72+
7373
return {
7474
log = req.sql,
7575
count = count,
@@ -133,7 +133,7 @@ function PrepareQuery(sql, parameters)
133133
local result = {}
134134
local escaped = false
135135
local hasParameters = false
136-
136+
137137
while sI <= sN and pI <= pN do
138138
local ch = sql:sub(sI, sI)
139139
if ch == '?' and not escaped then
@@ -154,7 +154,7 @@ function PrepareQuery(sql, parameters)
154154
end
155155
sI = sI + 1
156156
end
157-
157+
158158
-- no ? in the query
159159
if not hasParameters then
160160
return sql

‎scripts/serverCore.lua

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ function OnServerInit()
202202
expectedVersionPrefix)
203203
tes3mp.StopServer(1)
204204
end
205-
205+
206206
local eventStatus = customEventHooks.triggerValidators("OnServerInit", {})
207207

208208
if eventStatus.validDefaultHandler then
@@ -309,7 +309,7 @@ function OnServerExit(errorState)
309309
tes3mp.LogMessage(enumerations.log.INFO, "Called \"OnServerExit\"")
310310
tes3mp.LogMessage(enumerations.log.ERROR, "Error state: " .. tostring(errorState))
311311
local status, err = pcall(function()
312-
customEventHooks.triggerHandlers("OnServerExit", customEventHooks.makeEventStatus(true, true) , {errorState})
312+
customEventHooks.triggerHandlers("OnServerExit", customEventHooks.makeEventStatus(true, true), {errorState})
313313
end)
314314
if not status then
315315
tes3mp.LogMessage(enumerations.log.FATAL, "Error while exiting the server: " .. tostring(err))
@@ -319,7 +319,6 @@ end
319319
function OnServerScriptCrash(errorMessage)
320320
tes3mp.LogMessage(enumerations.log.ERROR, "Server crash from script error!")
321321
OnServerExit(errorMessage)
322-
--customEventHooks.triggerHandlers("OnServerExit", customEventHooks.makeEventStatus(true, true), {errorMessage})
323322
end
324323

325324
function LoadDataFileList(filename)

0 commit comments

Comments
 (0)
0