From 7e27844a667d058b780f201bcb82bc2b37e2f592 Mon Sep 17 00:00:00 2001
From: Atemo <Atemo@users.noreply.github.com>
Date: Mon, 4 Jan 2021 15:29:11 +0100
Subject: [PATCH] Added checks in geffen magic tournament instance (#5669)

Fixed #5664

Thanks to @mazvi
---
 npc/custom/official/GeffenMagicTournament.txt | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/npc/custom/official/GeffenMagicTournament.txt b/npc/custom/official/GeffenMagicTournament.txt
index 27c0c6e703..3203ff980d 100644
--- a/npc/custom/official/GeffenMagicTournament.txt
+++ b/npc/custom/official/GeffenMagicTournament.txt
@@ -2247,13 +2247,14 @@ OnTimer10000:
 	
 	initnpctimer;
 	
-	if ('HomID != 0) {
+	if (unitexists('HomID) && unitexists('BossID)) {
 		getunitdata 'BossID,.@bossdata;
 		getunitdata 'HomID,.@homdata;
 			if (distance(.@bossdata[6],.@bossdata[7],.@homdata[6],.@homdata[7]) > 10) {
 				unittalk 'BossID,"Alphonse, come!";
 				sleep 500;
-				unitwarp 'HomID, instance_mapname("1@ge_st"),.@bossdata[6],.@bossdata[7];
+				if (unitexists('HomID))
+					unitwarp 'HomID, instance_mapname("1@ge_st"),.@bossdata[6],.@bossdata[7];
 			}
 	}
 	else {