Skip to content

Commit aeb57f4

Browse files
MCvarialMCvarial
committed
1 parent 4268580 commit aeb57f4

31 files changed

+886
-797
lines changed

‎resources/irc/acl.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<acl>
1+
<acl>
22
<command name="!kick" level="2" echoChannelOnly="true" />
33
<command name="!uptime" level="0" echoChannelOnly="false" />
44
<command name="!say" level="0" echoChannelOnly="true" />
@@ -46,4 +46,6 @@
4646
<command name="!weather" level="3" echoChannelOnly="true" />
4747
<command name="!server" level="0" echoChannelOnly="false" />
4848
<command name="!zone" level="0" echoChannelOnly="false" />
49+
<command name="!refreshall" level="4" echoChannelOnly="false" />
50+
<command name="!refresh" level="4" echoChannelOnly="false" />
4951
</acl>

‎resources/irc/logs.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<html>
1+
<html>
22
<head>
33
<title>IRC logs</title>
44
</head>

‎resources/irc/meta.xml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<meta>
1+
<meta>
22
<settings>
33
<!-- Activate ingame irc client? -->
44
<setting
@@ -110,6 +110,7 @@
110110
<export function="ircIsCommandEchoChannelOnly" type="server" http="false" />
111111

112112
<!-- Don't touch this, you might break it. -->
113+
<script src="scripts/socketerrors.lua" type="server" />
113114
<script src="scripts/loading.lua" type="server" />
114115
<script src="scripts/utility.lua" type="server" />
115116
<script src="scripts/channels.lua" type="server" />
@@ -121,8 +122,8 @@
121122
<script src="scripts/levels.lua" type="server" />
122123
<script src="scripts/acl.lua" type="server" />
123124
<script src="scripts/ads.lua" type="client" />
124-
<script src="scripts/irccommands.lua" type="server" />
125125
<script src="scripts/echo.lua" type="server" />
126+
<script src="scripts/irccommands.lua" type="server" />
126127
<script src="scripts/ircclient_server.lua" type="server" />
127128
<script src="scripts/ircclient_client.lua" type="client" />
128129

‎resources/irc/scripts/acl.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
---------------------------------------------------------------------
1+
---------------------------------------------------------------------
22
-- Project: irc
33
-- Author: MCvarial
44
-- Contact: [email protected]

‎resources/irc/scripts/ads.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
---------------------------------------------------------------------
1+
---------------------------------------------------------------------
22
-- Project: irc
33
-- Author: MCvarial
44
-- Contact: [email protected]

‎resources/irc/scripts/channels.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
---------------------------------------------------------------------
1+
---------------------------------------------------------------------
22
-- Project: irc
33
-- Author: MCvarial
44
-- Contact: [email protected]

‎resources/irc/scripts/client.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
---------------------------------------------------------------------
1+
---------------------------------------------------------------------
22
-- Project: irc
33
-- Author: MCvarial
44
-- Contact: [email protected]

‎resources/irc/scripts/commands.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
---------------------------------------------------------------------
1+
---------------------------------------------------------------------
22
-- Project: irc
33
-- Author: MCvarial
44
-- Contact: [email protected]

‎resources/irc/scripts/core.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
---------------------------------------------------------------------
1+
---------------------------------------------------------------------
22
-- Project: irc
33
-- Author: MCvarial
44
-- Contact: [email protected]

‎resources/irc/scripts/echo.lua

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
---------------------------------------------------------------------
1+
---------------------------------------------------------------------
22
-- Project: irc
33
-- Author: MCvarial
44
-- Contact: [email protected]
@@ -63,7 +63,17 @@ addEventHandler("onPlayerChangeNick",root,
6363

6464
addEventHandler("onPlayerMute",root,
6565
function ()
66-
outputIRC("12* "..getPlayerName(source).." has been muted")
66+
if mutes[getPlayerSerial(source)] then
67+
local admin = mutes[getPlayerSerial(source)].admin or "console"
68+
local reason = mutes[getPlayerSerial(source)].reason
69+
if reason then
70+
outputIRC("12* "..getPlayerName(source).." has been muted by "..admin.." ("..reason..")")
71+
else
72+
outputIRC("12* "..getPlayerName(source).." has been muted by "..admin.." ("..reason..")")
73+
end
74+
else
75+
outputIRC("12* "..getPlayerName(source).." has been muted")
76+
end
6777
end
6878
)
6979

@@ -197,17 +207,6 @@ addEventHandler("onPlayerFreeze",root,
197207
end
198208
)
199209

200-
addEvent("onPlayerMute")
201-
addEventHandler("onPlayerMute",root,
202-
function (state)
203-
if state then
204-
outputIRC("12* "..getPlayerName(source).." was muted!")
205-
else
206-
outputIRC("12* "..getPlayerName(source).." was unmuted!")
207-
end
208-
end
209-
)
210-
211210
addEvent("aMessage",true)
212211
addEventHandler("aMessage",root,
213212
function (Type,t)

0 commit comments

Comments
 (0)