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:
Light2
2014-05-06 00:55:19 +02:00
parent ce15656ff3 1e89fbcf2a
commit 61bfc193ec
229 changed files with 4814 additions and 213 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/services/SimulationService.java
+9 -5
View File
@@ -924,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)
@@ -991,6 +991,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);
@@ -1203,8 +1207,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;