From a8abae4497fe241f642b66cc3376d7af9002cf41 Mon Sep 17 00:00:00 2001 From: rubenwardy Date: Wed, 25 Nov 2015 20:58:00 +0000 Subject: [PATCH] Fix things --- mods/ctf_match/matches.lua | 6 +++--- mods/ctf_pvp_engine | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/mods/ctf_match/matches.lua b/mods/ctf_match/matches.lua index e790be3..d85f6fa 100644 --- a/mods/ctf_match/matches.lua +++ b/mods/ctf_match/matches.lua @@ -38,7 +38,6 @@ ctf.register_on_new_game(function() ctf.log("match", "Setting up new game!") teams = teams:split(";") - local pos = {} for i, v in pairs(teams) do local team = v:split(",") if #team == 5 then @@ -47,7 +46,7 @@ ctf.register_on_new_game(function() local x = tonumber(team[3]:trim()) local y = tonumber(team[4]:trim()) local z = tonumber(team[5]:trim()) - pos[name] = { + local flag = { x = x, y = y, z = z @@ -59,7 +58,8 @@ ctf.register_on_new_game(function() add_team = true }) - ctf_flag.add(name, pos[name]) + ctf_flag.add(name, flag) + ctf_flag.assert_flag(flag) else ctf.warning("match", "Invalid team setup: " .. dump(v)) end diff --git a/mods/ctf_pvp_engine b/mods/ctf_pvp_engine index 0a4f30d..a914b43 160000 --- a/mods/ctf_pvp_engine +++ b/mods/ctf_pvp_engine @@ -1 +1 @@ -Subproject commit 0a4f30df25a96f250d4a994a7e101a9e3225c063 +Subproject commit a914b43439e8ebd2daf4f8b8f0a4fc5c50ead66f