From b1aa1366f40b099f878edbfcf5c1a6af5d8fd258 Mon Sep 17 00:00:00 2001 From: ANAND Date: Thu, 7 May 2020 14:52:14 +0530 Subject: [PATCH] ctf_classes: Fix crash when player meta contains invalid class name (#607) --- mods/ctf/ctf_classes/api.lua | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/mods/ctf/ctf_classes/api.lua b/mods/ctf/ctf_classes/api.lua index 2b5905d..3968d6c 100644 --- a/mods/ctf/ctf_classes/api.lua +++ b/mods/ctf/ctf_classes/api.lua @@ -59,7 +59,11 @@ function ctf_classes.get(player) player = minetest.get_player_by_name(player) end - local cname = player:get_meta():get("ctf_classes:class") or ctf_classes.default_class + -- Return class from player meta if valid, or default class + local cname = player:get_meta():get("ctf_classes:class") + if not ctf_classes.__classes[cname] then + cname = ctf_classes.default_class + end return ctf_classes.__classes[cname] end