Merge remote-tracking branch 'origin/develop' into develop

2019-08-09 23:23:47 -04:00
parent 2c486d7da1 81d56bec6a
commit f3448fdc89
2 changed files with 11 additions and 2 deletions
@@ -326,8 +326,13 @@ public class ObjectBuilderFactory
 		if(user == null)
 		{
 			Guild jdaGuild = kitty.getGuildById(guildID);
+			if(jdaGuild == null) return null;
+			
 			Member jdaMember = jdaGuild.getMemberById(userID);
+			if(jdaMember == null) return null;
+			
 			User jdaUser = jdaMember.getUser();
+			if(jdaUser == null) return null;
 			
 			user = extractUserByJDAUser(guildID, jdaMember.getNickname(), jdaUser.getId(), jdaUser.getAvatarUrl(), jdaUser.getId());
 			updateUser(user, jdaMember);