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

Added loading of objects from datatables/buildout, added building and cell baseline packets, fixed crash on spawning of static objects....

Browse Source 
...updated engine, added restuss shuttleport and theed starport spawns,
increased view range for large objects loaded from buildout datatables
like jabbas/theed palace etc.
This commit is contained in:
Light2
2013-11-26 22:28:38 +01:00
parent bb085477c4
commit 0a040424f6
23 changed files with 404 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/services/SimulationService.java
+10 -3
View File
@@ -248,7 +248,7 @@ public class SimulationService implements INetworkDispatch {
// + " should be: " + dataTransform.getYPosition());
UpdateTransformMessage utm = new UpdateTransformMessage(object.getObjectID(), dataTransform.getTransformedX(), dataTransform.getTransformedY(), dataTransform.getTransformedZ(), dataTransform.getMovementCounter(), (byte) dataTransform.getMovementAngle(), dataTransform.getSpeed());
List<SWGObject> newAwareObjects = get(object.getPlanet(), newPos.x, newPos.z, 200);
List<SWGObject> newAwareObjects = get(object.getPlanet(), newPos.x, newPos.z, 512);
ArrayList<SWGObject> oldAwareObjects = new ArrayList<SWGObject>(object.getAwareObjects());
Collection<SWGObject> updateAwareObjects = CollectionUtils.intersection(oldAwareObjects, newAwareObjects);
object.notifyObservers(utm, false);
@@ -256,6 +256,8 @@ public class SimulationService implements INetworkDispatch {
for(int i = 0; i < oldAwareObjects.size(); i++) {
SWGObject obj = oldAwareObjects.get(i);
if(!updateAwareObjects.contains(obj) && obj != object && obj.getWorldPosition().getDistance2D(newPos) > 200 && obj.isInQuadtree() /*&& obj.getParentId() == 0*/) {
if(obj.getAttachment("bigSpawnRange") != null && obj.getWorldPosition().getDistance2D(newPos) < 512)
continue;
object.makeUnaware(obj);
if(obj.getClient() != null)
obj.makeUnaware(object);
@@ -263,7 +265,10 @@ public class SimulationService implements INetworkDispatch {
}
for(int i = 0; i < newAwareObjects.size(); i++) {
SWGObject obj = newAwareObjects.get(i);
if(!updateAwareObjects.contains(obj) && obj != object && !object.getAwareObjects().contains(obj) && obj.getWorldPosition().getDistance2D(newPos) <= 200 && obj.getContainer() != object && obj.isInQuadtree()) {
//System.out.println(obj.getTemplate());
if(!updateAwareObjects.contains(obj) && obj != object && !object.getAwareObjects().contains(obj) && obj.getContainer() != object && obj.isInQuadtree()) {
if(obj.getAttachment("bigSpawnRange") == null && obj.getWorldPosition().getDistance2D(newPos) > 200)
continue;
object.makeAware(obj);
if(obj.getClient() != null)
obj.makeAware(object);
@@ -515,9 +520,11 @@ public class SimulationService implements INetworkDispatch {
Point3D pos = object.getWorldPosition();
Collection<SWGObject> newAwareObjects = get(object.getPlanet(), pos.x, pos.z, 200);
Collection<SWGObject> newAwareObjects = get(object.getPlanet(), pos.x, pos.z, 512);
for(Iterator<SWGObject> it = newAwareObjects.iterator(); it.hasNext();) {
SWGObject obj = it.next();
if(obj.getAttachment("bigSpawnRange") == null & obj.getWorldPosition().getDistance(pos) > 200)
continue;
object.makeAware(obj);
if(obj.getClient() != null)
obj.makeAware(object);