From ddd20b652ce3958f22070830aadb4404d5a4833e Mon Sep 17 00:00:00 2001
From: Obique <obique.pswg@gmail.com>
Date: Wed, 9 Oct 2019 02:40:39 -0400
Subject: [PATCH] Fixed system chat room spam

---
 .../resources/support/global/chat/ChatRoomHandler.java      | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/projectswg/holocore/resources/support/global/chat/ChatRoomHandler.java b/src/main/java/com/projectswg/holocore/resources/support/global/chat/ChatRoomHandler.java
index dddaf3a2..a0be428f 100644
--- a/src/main/java/com/projectswg/holocore/resources/support/global/chat/ChatRoomHandler.java
+++ b/src/main/java/com/projectswg/holocore/resources/support/global/chat/ChatRoomHandler.java
@@ -40,6 +40,7 @@ import com.projectswg.holocore.resources.support.data.server_info.CachedObjectDa
 import com.projectswg.holocore.resources.support.data.server_info.ObjectDatabase;
 import com.projectswg.holocore.resources.support.global.player.AccessLevel;
 import com.projectswg.holocore.resources.support.global.player.Player;
+import com.projectswg.holocore.resources.support.objects.swg.player.PlayerObject;
 import com.projectswg.holocore.services.support.global.chat.ChatRoomService;
 import com.projectswg.holocore.services.support.global.zone.CharacterLookupService.PlayerLookup;
 import org.jetbrains.annotations.NotNull;
@@ -327,7 +328,10 @@ public class ChatRoomHandler {
 		ChatRoomMessage chatRoomMessage = new ChatRoomMessage(sender, room.getId(), message, oob);
 		for (ChatAvatar member : room.getMembers()) {
 			Player player = getPlayer(member);
-			if (player.getPlayerObject().isIgnored(sender.getName()))
+			if (player == null)
+				continue;
+			PlayerObject playerObject = player.getPlayerObject();
+			if (playerObject != null && playerObject.isIgnored(sender.getName()))
 				continue;
 			
 			player.sendPacket(chatRoomMessage);