From 88627d65a32c4e88061434742a9f63babd236dc0 Mon Sep 17 00:00:00 2001
From: Waverunner <waverun@live.com>
Date: Sun, 27 Jul 2014 12:59:05 -0400
Subject: [PATCH] Fixed guilds not being removed from the GuildObject when
 disbanding

---
 src/services/GuildService.java | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/services/GuildService.java b/src/services/GuildService.java
index 19fc82c3..f318ff93 100644
--- a/src/services/GuildService.java
+++ b/src/services/GuildService.java
@@ -1124,8 +1124,14 @@ public class GuildService implements INetworkDispatch {
 	public boolean removeGuild(int id) {
 		Guild guild = getGuildById(id);
 		
-		if (guild != null) 
-			return true;
+		if (guild != null) {
+			if (object.getGuildList().remove(guild.getString())) {
+				object.getGuilds().remove(id);
+				if (object.getGuilds().containsKey(id)) return true;
+				else return false;
+			}
+			else return false;
+		}
 		
 		return false;
 	}