From 5ca6f4ecd678227afe1130add97f0dd782f08c82 Mon Sep 17 00:00:00 2001
From: Treeku <treeku@gmx.com>
Date: Sun, 13 Jul 2014 22:31:34 +0100
Subject: [PATCH] Fixed guilds being requested for invalid targets

---
 src/services/PlayerService.java | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/services/PlayerService.java b/src/services/PlayerService.java
index 2dcf28b0..e65d989c 100644
--- a/src/services/PlayerService.java
+++ b/src/services/PlayerService.java
@@ -378,6 +378,11 @@ public class PlayerService implements INetworkDispatch {
 			
 			CreatureObject targetPlayer = (CreatureObject) core.objectService.getObject(request.getCharacterId());
 			
+			if (targetPlayer == null) {
+				System.err.println("PlayerService::GuildRequestMessage: Target is null: " + request.getCharacterId());
+				return;
+			}
+			
 			if (targetPlayer.getGuildId() != 0) {
 				Guild targetGuild = core.guildService.getGuildById(targetPlayer.getGuildId());
 				GuildResponseMessage response = new GuildResponseMessage(request.getCharacterId(), targetGuild.getName());