Skip to content

1.2 wip #46

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
TovarischPootis merged 5 commits into from
Apr 2, 2021
Merged

1.2 wip #46

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0a14f3c
Fixed admin delay
zoephix Feb 28, 2021
e7423be
Fixed admin chat delay
zoephix Feb 28, 2021
434fe6e
Fixed chat delay (for real this time)
zoephix Mar 1, 2021
ec75f33
Keys open-ended (#29)
raecyst Mar 4, 2021
e6bf8e3
Merge branch 'heads/1.2' into 1.2-wip
TovarischPootis Apr 2, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 14 additions & 12 deletions gamemode/core/libs/sh_chatbox.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,14 +263,14 @@ do
else
local delay = nut.config.get("oocDelay", 10)

-- Admin delay bypass
if (speaker:IsAdmin() and nut.config.get("oocDelayAdmin", false)) then
-- Only need to check the time if they have spoken in OOC chat before.
if (delay > 0 and speaker.nutLastOOC) then
local lastOOC = CurTime() - speaker.nutLastOOC

-- Use this method of checking time in case the oocDelay config changes.
if (lastOOC <= delay) then
-- Only need to check the time if they have spoken in OOC chat before.
if (delay > 0 and speaker.nutLastOOC) then
local lastOOC = CurTime() - speaker.nutLastOOC

-- Use this method of checking time in case the oocDelay config changes.
if (lastOOC <= delay) then
-- Admin delay bypass
if (!speaker:IsAdmin() or speaker:IsAdmin() and nut.config.get("oocDelayAdmin", false)) then
speaker:notifyLocalized("oocDelay", delay - math.ceil(lastOOC))

return false
Expand Down Expand Up @@ -321,17 +321,19 @@ do
onCanSay = function(speaker, text)
local delay = nut.config.get("loocDelay", 0)

-- Admin delay bypass
-- Only need to check the time if they have spoken in LOOC chat before.
if (speaker:IsAdmin() and nut.config.get("loocDelayAdmin", false)) then
-- Only need to check the time if they have spoken in OOC chat before.
if (delay > 0 and speaker.nutLastLOOC) then
local lastLOOC = CurTime() - speaker.nutLastLOOC

-- Use this method of checking time in case the oocDelay config changes.
if (lastLOOC <= delay) then
speaker:notifyLocalized("loocDelay", delay - math.ceil(lastLOOC))
-- Admin delay bypass
if (!speaker:IsAdmin() or speaker:IsAdmin() and nut.config.get("oocDelayAdmin", false)) then
speaker:notifyLocalized("oocDelay", delay - math.ceil(lastOOC))

return false
return false
end
end
end
end
Expand Down