A few fixes

Author: MCvarial

resources/irc/acl.xml

@@ -38,5 +38,6 @@
 	<command name="!team" level="0" echoChannelOnly="true" />
 	<command name="!ping" level="0" echoChannelOnly="true" />
 	<command name="!modules" level="3" echoChannelOnly="true" />
-        <command name="!changemap" level="3" echoChannelOnly="true" />
+    <command name="!changemap" level="3" echoChannelOnly="true" />
+    <command name="!map" level="0" echoChannelOnly="true" />
 </acl>

resources/irc/meta.xml

@@ -38,7 +38,7 @@
 	</settings>
 
 	<!-- Don't touch anything below! -->
-	<info author="MCvarial" version="1.0.0" type="misc" name="irc" description="Echobot to be used on irc" />
+	<info author="MCvarial" version="1.0.1" type="misc" name="irc" description="Echobot to be used on irc" />
 
 	<export function="ircHop" type="server" http="false" />
 	<export function="ircSay" type="server" http="false" />

resources/irc/scripts/echo.lua

@@ -140,6 +140,15 @@ addEventHandler("onUnban",root,
 	end
 )
 
+addEvent("onPlayerRaceWasted")
+addEventHandler("onPlayerRaceWasted",root,
+	function (vehicle)
+		if #getAlivePlayers() == 1 and currentmode ~= "Sprint" then
+			outputIRC("12* "..getPlayerName(getAlivePlayers()[1]).." won the deathmatch!")
+		end
+	end
+)
+
 ------------------------------------
 -- Admin interaction
 ------------------------------------
@@ -165,6 +174,17 @@ addEventHandler("onPlayerMute",root,
 	end
 )
 
+addEvent("aMessage",true)
+addEventHandler("aMessage",root,
+	function (_,t)
+		local channel = ircGetEchoChannel()
+		ircRaw(ircGetChannelServer(channel),"NOTICE %"..tostring(ircGetChannelName(channel)).." :New admin message by "..tostring(getPlayerName(source)))
+		ircRaw(ircGetChannelServer(channel),"NOTICE %"..tostring(ircGetChannelName(channel)).." :Category: "..tostring(t.category))
+		ircRaw(ircGetChannelServer(channel),"NOTICE %"..tostring(ircGetChannelName(channel)).." :Subject: "..tostring(t.subject))
+		ircRaw(ircGetChannelServer(channel),"NOTICE %"..tostring(ircGetChannelName(channel)).." :Message: "..tostring(t.message))
+	end
+)
+
 ------------------------------------
 -- Votemanager interaction
 ------------------------------------

resources/irc/scripts/handling.lua

@@ -43,7 +43,9 @@ addEventHandler("onSockData",root,
 addEvent("onIRCRaw")
 addEventHandler("onIRCRaw",root,
 	function (data)
-		resetTimer(servers[source][12])
+		if isTimer(servers[source][12]) then
+			resetTimer(servers[source][12])
+		end
 		local t = split(data,32)
 
 		if type(servers[source][12]) == "number" then
@@ -205,7 +207,9 @@ addEventHandler("onIRCConnect",root,
 			ircRaw(source,raw)
 		end
 		servers[source][16] = {}
-		killTimer(servers[source][12])
+		if isTimer(servers[source][12]) then
+			killTimer(servers[source][12])
+		end
 		servers[source][12] = setTimer(ircReconnect,600000,0,source,"Connection timed out!")
 	end
 )

resources/irc/scripts/ircclient_server.lua

@@ -117,5 +117,5 @@ function triggerIRCEvent (eventname,...)
 end
 
 function ircGetChannelTitle (channel)
-	return ircGetChannelName(channel).." - "..ircGetServerName(ircGetChannelServer(channel))
+	return tostring(ircGetChannelName(channel)).." - "..tostring(ircGetServerName(ircGetChannelServer(channel)))
 end

resources/irc/scripts/irccommands.lua

@@ -540,6 +540,12 @@ addIRCCommandHandler("!changemap",
 	end
 )
 
+addIRCCommandHandler("!map",
+	function (server,channel,user,command,...)
+		ircSay(channel,"12* Current Map: 01"..tostring(getMapName()))
+	end
+)
+
 addIRCCommandHandler("!modules",
 	function (server,channel,user,command)
 		ircSay(channel,"07Loaded modules: "..table.concat(getLoadedModules(),", "))

resources/irc/scripts/loading.lua

@@ -77,7 +77,7 @@ addEventHandler("onResourceStart",resourceRoot,
 						local args = {...}
 						for i,arg in ipairs (args) do
 							local expectedArgType = gettok(line,(2+i),32)
-							if type(arg) ~= expectedArgType and not (expectedArgType or string.find(expectedArgType,")")) then
+							if expectedArgType and type(arg) ~= expectedArgType and not (expectedArgType or string.find(expectedArgType,")")) then
 								outputServerLog("IRC: Bad argument #"..i.." @ '"..gettok(line,2,32).."' "..expectedArgType.." expected, got "..type(arg))
 								return
 							end