[openjk] 13/23: [MP] Fix ghoul2 crash found by changing from FFA->Siege and restarting map on local server

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch debian/master
in repository openjk.

commit 41bd4d8f5eabf0a24ffdb8cc3d9071d857cda532
Author: Razish <mrrazish at gmail.com>
Date:   Mon Dec 25 10:38:21 2017 +1100

    [MP] Fix ghoul2 crash found by changing from FFA->Siege and restarting map on local server
---
 codemp/server/sv_gameapi.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/codemp/server/sv_gameapi.cpp b/codemp/server/sv_gameapi.cpp
index 8879f7b..ea7135c 100644
--- a/codemp/server/sv_gameapi.cpp
+++ b/codemp/server/sv_gameapi.cpp
@@ -1542,6 +1542,9 @@ static int SV_G2API_CopyGhoul2Instance( void *g2From, void *g2To, int modelIndex
 }
 
 static void SV_G2API_CopySpecificGhoul2Model( void *g2From, int modelFrom, void *g2To, int modelTo ) {
+	if ( !g2From || !g2To ) {
+		return;
+	}
 	re->G2API_CopySpecificG2Model( *((CGhoul2Info_v *)g2From), modelFrom, *((CGhoul2Info_v *)g2To), modelTo );
 }
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/openjk.git