minetest/capturetheflag
2
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Allow more than two teams in a match at once (#724)

Browse source 
* Fix bugs with more than two teams

* Fix team allocation

* Fix bugz

* Fix crash

* Fix crash with crash fix
This commit is contained in:
LoneWolfHT 2020-12-25 10:37:02 -08:00 • committed by GitHub
parent 0ef16edb23
commit fbf0126599
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
14 changed files with 87 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

6
mods/ctf/ctf/teams.lua
View file

@ -116,6 +116,8 @@ function ctf.chat_send_team(team, msg)
team = ctf.team(team)
end
if not team then return end
for pname, _ in pairs(team.players) do
minetest.chat_send_player(pname, msg)
end
@ -199,6 +201,7 @@ function ctf.join(name, team, force, by)
end
end
local prevteam = player.team
player.team = team
team_data.players[player.name] = player
ctf.player_last_team[name] = team
@ -219,7 +222,7 @@ function ctf.join(name, team, force, by)
minetest.log("action", name .. " joined team " .. team)
for i = 1, #ctf.registered_on_join_team do
ctf.registered_on_join_team[i](name, team)
ctf.registered_on_join_team[i](name, team, prevteam)
end
return true
end
@ -421,6 +424,7 @@ minetest.register_on_joinplayer(function(player)
local name = player:get_player_name()
if ctf.team(ctf.player(name).team) then
minetest.log("action", name.." already in team so not allocating")
return
end