Skip to content

Refactor nadmod_ppfriends to not use ReadTable #3

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

Open
Derpius wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Refactor nadmod_ppfriends to not use ReadTable #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 15 additions & 2 deletions lua/autorun/client/cl_nadmodpp.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,11 +296,24 @@ net.Receive("nadmod_ppfriends", function()
end)

concommand.Add("npp_applyfriends", function()
local networkableFriends = {}
for _, tar in pairs(player.GetAll()) do
NADMOD.Friends[tar:SteamID()] = GetConVar("npp_friend_" .. tar:SteamID64bot()):GetBool()
local steamId = tar:SteamID()
local isFriendConVar = GetConVar("npp_friend_" .. tar:SteamID64bot())
local isFriend = isFriendConVar and isFriendConVar:GetBool()

NADMOD.Friends[steamId] = isFriend

if isFriend then
table.insert(networkableFriends, steamId)
end
end

net.Start("nadmod_ppfriends")
net.WriteTable(NADMOD.Friends)
net.WriteUInt(#networkableFriends, 8)
for _, friendSteamId in ipairs(networkableFriends) do
net.WriteString(friendSteamId)
end
net.SendToServer()
end)

Expand Down
25 changes: 12 additions & 13 deletions lua/autorun/server/nadmod_pp.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -691,30 +691,29 @@ concommand.Add("npp_refreshfriends", function(ply, _cmd, _args)
net.WriteTable(friends)
net.Send(ply)
end)

net.Receive("nadmod_ppfriends", function(_len, ply)
if not ply:IsValid() then
return
end
if not NADMOD.Users[ply:SteamID()] then
NADMOD.Users[ply:SteamID()] = { Rank = 1 }
end
NADMOD.Users[ply:SteamID()].Friends = NADMOD.Users[ply:SteamID()].Friends or {}
local outtab = NADMOD.Users[ply:SteamID()].Friends

NADMOD.Users[ply:SteamID()] = NADMOD.Users[ply:SteamID()] or { Rank = 1 }
local userFriendsTable = {}
NADMOD.Users[ply:SteamID()].Friends = userFriendsTable

local players = {}
for _, v in pairs(player.GetAll()) do
players[v:SteamID()] = v
players[v:SteamID()] = true
end

for steamid, bool in pairs(net.ReadTable()) do
if players[steamid] then -- Users may not add admins to their friends list
if bool then
outtab[steamid] = true
else
outtab[steamid] = nil
end -- Don't bother storing falses
for _ = 1, net.ReadUInt(8) do
local steamId = net.ReadString()

if players[steamId] then
userFriendsTable[steamId] = true
end
end

NADMOD.Save()
NADMOD.Notify(ply, "Friends received!")
end)
Expand Down