From 7342f5420b2e3bdb43a4513a70b92880c59aaa4c Mon Sep 17 00:00:00 2001
From: Aria <ariahyrule@gmail.com>
Date: Mon, 9 Dec 2019 16:29:51 +0100
Subject: [PATCH] Placeholders are no longer ignored when a player isn't in a
 guild

---
 .../net/Indyuce/mmocore/comp/placeholder/RPGPlaceholders.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/net/Indyuce/mmocore/comp/placeholder/RPGPlaceholders.java b/src/main/java/net/Indyuce/mmocore/comp/placeholder/RPGPlaceholders.java
index 4a3e0088..646070c8 100644
--- a/src/main/java/net/Indyuce/mmocore/comp/placeholder/RPGPlaceholders.java
+++ b/src/main/java/net/Indyuce/mmocore/comp/placeholder/RPGPlaceholders.java
@@ -153,7 +153,7 @@ public class RPGPlaceholders extends PlaceholderExpansion /** implements Relatio
 		else if (identifier.startsWith("guild_")) {
 			String placeholder = identifier.substring(6);
 			PlayerData data = PlayerData.get(player);
-			if(data.getGuild() == null) return null;
+			if(data.getGuild() == null) return "";
 			
 			if (placeholder.equalsIgnoreCase("name"))
 				return data.getGuild().getName();