From: Mario <zacjardine@y7mail.com>
Date: Tue, 11 Sep 2018 20:22:52 +0000 (+1000)
Subject: Ignore the join delay for the host in local matches
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=refs%2Fheads%2FMario%2Flocal_join_fix;p=xonotic%2Fxonotic-data.pk3dir.git

Ignore the join delay for the host in local matches
---

diff --git a/qcsrc/server/client.qc b/qcsrc/server/client.qc
index 8b70a633a..52fd58c9c 100644
--- a/qcsrc/server/client.qc
+++ b/qcsrc/server/client.qc
@@ -2021,7 +2021,7 @@ const int MIN_SPEC_TIME = 1;
 bool joinAllowed(entity this)
 {
 	if (CS(this).version_mismatch) return false;
-	if (time < CS(this).jointime + MIN_SPEC_TIME) return false;
+	if (this.netaddress != "local" && time < CS(this).jointime + MIN_SPEC_TIME) return false;
 	if (!nJoinAllowed(this, this)) return false;
 	if (teamplay && lockteams) return false;
 	if (MUTATOR_CALLHOOK(ForbidSpawn, this)) return false;