From fab8636fa1d0ac6d5a25f82f7d7c924a31650b89 Mon Sep 17 00:00:00 2001
From: Waverunner <waverun@live.com>
Date: Wed, 14 May 2014 14:45:24 -0400
Subject: [PATCH 1/2] Fixed #655: Groupchat you can post in it only via using
 "ctrl + g"

---
 src/services/chat/ChatService.java | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/services/chat/ChatService.java b/src/services/chat/ChatService.java
index 47ed57df..251d125e 100644
--- a/src/services/chat/ChatService.java
+++ b/src/services/chat/ChatService.java
@@ -941,6 +941,7 @@ public class ChatService implements INetworkDispatch {
 			}
 			
 			room.addUser(user.toLowerCase());
+			((CreatureObject) player).getPlayerObject().addChannel(roomId);
 			return true;
 		}
 		return false;
@@ -1001,10 +1002,6 @@ public class ChatService implements INetworkDispatch {
 		});
 	}
 	
-	public void handleGroupChat(SWGObject sender, String message) {
-		
-	}
-	
 	public ConcurrentHashMap<Integer, ChatRoom> getChatRooms() {
 		return chatRooms;
 	}

From 3443856857e2e0caa0bb00d20be678520d2c2189 Mon Sep 17 00:00:00 2001
From: Waverunner <waverun@live.com>
Date: Wed, 14 May 2014 14:55:59 -0400
Subject: [PATCH 2/2] Fixed #657: Reset expertise does not remove buffs

---
 src/services/SkillService.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/services/SkillService.java b/src/services/SkillService.java
index a61116b3..6396581f 100644
--- a/src/services/SkillService.java
+++ b/src/services/SkillService.java
@@ -399,6 +399,8 @@ public class SkillService implements INetworkDispatch {
 	public void resetExpertise(CreatureObject creature) {
 		List<String> skills = new ArrayList<String>(creature.getSkills());
 		skills.stream().filter(s -> s.contains("expertise")).forEach(s -> removeSkill(creature, s));
+		
+		creature.getBuffList().stream().forEach(buff -> creature.removeBuff(buff));
 	}
 	
 	public void sendRespecWindow(CreatureObject creature) {