projectswg/NGECore2
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/NGECore2.git synced 2026-07-30 00:15:57 -04:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2

Browse Source
This commit is contained in:
Waverunner
2014-03-29 16:48:01 -04:00
parent dfab6ac265 26053c7baa
commit 352cc1cd5e
14 changed files with 270 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/services/SimulationService.java
+6 -5
View File
@@ -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.*;
@@ -755,8 +756,6 @@ public class SimulationService implements INetworkDispatch {
}
}
core.groupService.handleGroupDisband(object); // Seefo: Temporarily moved from connectionService.disconnect as a temporary fix for issue #295
/*
object.createTransaction(core.getCreatureODB().getEnvironment());
core.getCreatureODB().put(object, Long.class, CreatureObject.class, object.getTransaction());
@@ -812,6 +811,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) {
@@ -844,9 +847,7 @@ public class SimulationService implements INetworkDispatch {
synchronized(object.getMutex()) {
object.getAwareObjects().removeAll(object.getAwareObjects());
}
object.setPlanet(planet);
@@ -872,7 +873,7 @@ public class SimulationService implements INetworkDispatch {
if(container.getPermissions().canView(requester, container)) {
OpenedContainerMessage opm = new OpenedContainerMessage(container.getObjectID());
if(requester.getClient() != null && requester.getClient().getSession() != null)
if(requester.getClient() != null && requester.getClient().getSession() != null && !(container instanceof CreatureObject))
requester.getClient().getSession().write(opm.serialize());
}