From dfd7f1e9a92622db620889b7e88f1d9402df4191 Mon Sep 17 00:00:00 2001
From: Light2 <light_pswg@yahoo.com>
Date: Sat, 29 Mar 2014 18:32:29 +0100
Subject: [PATCH] Fixed bug where group wouldnt show up when player loaded a
 new scene

---
 src/services/SimulationService.java | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/services/SimulationService.java b/src/services/SimulationService.java
index bb495850..35e1c3f4 100644
--- a/src/services/SimulationService.java
+++ b/src/services/SimulationService.java
@@ -75,6 +75,7 @@ import protocol.swg.objectControllerObjects.TargetUpdate;
 import resources.objects.building.BuildingObject;
 import resources.objects.cell.CellObject;
 import resources.objects.creature.CreatureObject;
+import resources.objects.group.GroupObject;
 import resources.objects.player.PlayerObject;
 import resources.objects.tangible.TangibleObject;
 import resources.common.*;
@@ -811,6 +812,10 @@ public class SimulationService implements INetworkDispatch {
 			object.playMusic("sound/music_acq_bountyhunter.snd");
 			core.skillService.addSkill(object, ghost.getProfessionWheelPosition());
 		}
+		
+		if(object.getGroupId() != 0 && core.objectService.getObject(object.getGroupId()) instanceof GroupObject)
+			object.makeAware(core.objectService.getObject(object.getGroupId()));
+		
 	}
 		
 	public void transferToPlanet(SWGObject object, Planet planet, Point3D newPos, Quaternion newOrientation, SWGObject newParent) {
@@ -843,9 +848,7 @@ public class SimulationService implements INetworkDispatch {
 		
 		
 		synchronized(object.getMutex()) {
-			
 			object.getAwareObjects().removeAll(object.getAwareObjects());
-			
 		}
 		
 		object.setPlanet(planet);