projectswg/NGECore2
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/NGECore2.git synced 2026-07-31 01: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:
Treeku
2014-05-06 02:35:22 +01:00
parent 66f0571584 b7ec88bd5c
commit 8b2aa2a46e
246 changed files with 5236 additions and 232 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/services/SimulationService.java
+11 -6
View File
@@ -78,6 +78,7 @@ import resources.objects.building.BuildingObject;
import resources.objects.cell.CellObject;
import resources.objects.creature.CreatureObject;
import resources.objects.group.GroupObject;
import resources.objects.harvester.HarvesterObject;
import resources.objects.player.PlayerObject;
import resources.objects.tangible.TangibleObject;
import resources.common.*;
@@ -192,7 +193,7 @@ public class SimulationService implements INetworkDispatch {
while(cursor.hasNext()) {
SWGObject building = core.objectService.getObject(((SWGObject) cursor.next()).getObjectID());
if(building == null || !(building instanceof BuildingObject))
if(building == null || (!(building instanceof BuildingObject) && !(building instanceof HarvesterObject)))
continue;
if(building.getAttachment("hasLoadedServerTemplate") == null)
core.objectService.loadServerTemplate(building);
@@ -923,10 +924,10 @@ 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 && !(container instanceof CreatureObject))
if(requester.getClient() != null && requester.getClient().getSession() != null && !(container instanceof CreatureObject)){
requester.getClient().getSession().write(opm.serialize());
}
}
}
}
public void transform(TangibleObject obj, Point3D position)
@@ -995,6 +996,10 @@ public class SimulationService implements INetworkDispatch {
float heightOrigin = 1.f;
float heightDirection = 1.f;
if (obj2.getTemplate().equals("object/tangible/inventory/shared_character_inventory.iff")){
obj2 = obj2.getContainer(); // LOS message fix on corpse
}
if(obj1 instanceof CreatureObject)
heightOrigin = getHeightOrigin((CreatureObject) obj1);
@@ -1207,8 +1212,8 @@ public class SimulationService implements INetworkDispatch {
float height = (float) (creature.getHeight()/* - 0.3*/);
if(creature.getPosture() == 2 || creature.getPosture() == 13)
height = 0.3f;
if(creature.getPosture() == 2 || creature.getPosture() == 13 || creature.getPosture() == 14)
height = 0.45f;
else if(creature.getPosture() == 1)
height /= 2.f;