From bfde621b9b5a9e0dad78f790f9e88b3c28c00dd1 Mon Sep 17 00:00:00 2001
From: Svornost <11434-svornost@users.noreply.gitgud.io>
Date: Sun, 24 Oct 2021 21:03:32 -0700
Subject: [PATCH] asSlave/asPlayer should always return null for null or
undefined parameters.
---
src/js/utilsMisc.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/js/utilsMisc.js b/src/js/utilsMisc.js
index 6454318fa06..43baf19513d 100644
--- a/src/js/utilsMisc.js
+++ b/src/js/utilsMisc.js
@@ -153,7 +153,7 @@ App.Utils.getRaceArrayWithoutParamRace = function(badRace) {
* @returns {App.Entity.PlayerState}
*/
globalThis.asPlayer = function(human) {
- if (human.ID !== -1) {
+ if (!human || human.ID !== -1) {
return null;
}
return /** @type {App.Entity.PlayerState} */(human);
@@ -164,7 +164,7 @@ globalThis.asPlayer = function(human) {
* @returns {App.Entity.SlaveState}
*/
globalThis.asSlave = function(human) {
- if (human && human.ID === -1) {
+ if (!human || human.ID === -1) {
return null;
}
return /** @type {App.Entity.SlaveState} */(human);
--
GitLab