remove second getOtherPlayers() (#43)

This commit is contained in:
Ho-spair 2023-01-16 19:14:14 +08:00 committed by GitHub
parent b6530eae9d
commit 1dd9abda14
1 changed files with 42 additions and 13 deletions

View File

@ -144,8 +144,28 @@ function Room:deadPlayerFilter(playerIds)
return newPlayerIds
end
---@param sortBySeat boolean
---@return ServerPlayer[]
function Room:getAlivePlayers()
function Room:getAllPlayers(sortBySeat)
if sortBySeat == nil or sortBySeat then
local current = self.current
local temp = current.next
local ret = {current}
while temp ~= current do
table.insert(ret, temp)
temp = temp.next
end
return ret
else
return { table.unpack(self.players) }
end
end
---@param sortBySeat boolean
---@return ServerPlayer[]
function Room:getAlivePlayers(sortBySeat)
if sortBySeat == nil or sortBySeat then
local current = self.current
local temp = current.next
local ret = {current}
@ -155,22 +175,31 @@ function Room:getAlivePlayers()
end
temp = temp.next
end
return ret
else
return { table.unpack(self.alive_players) }
end
end
---@param player ServerPlayer
---@param sortBySeat boolean
---@param include_dead boolean
---@return ServerPlayer[]
function Room:getOtherPlayers(player, sortBySeat)
local alivePlayers = self:getAlivePlayers(sortBySeat)
for _, p in ipairs(alivePlayers) do
function Room:getOtherPlayers(player, sortBySeat, include_dead)
if sortBySeat == nil then
sortBySeat = true
end
local players = include_dead and self:getAllPlayers(sortBySeat) or self:getAlivePlayers(sortBySeat)
for _, p in ipairs(players) do
if p.id == player.id then
table.removeOne(alivePlayers, player)
table.removeOne(players, player)
break
end
end
return alivePlayers
return players
end
---@return ServerPlayer | null