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 
Conflicts:
	src/services/SimulationService.java
This commit is contained in:
Light2
2013-12-16 20:58:14 +01:00
parent 56a735c9b1 c252f9f1e3
commit c3cf8713bf
20 changed files with 131 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/services/SimulationService.java
+8 -3
View File
@@ -79,6 +79,7 @@ import resources.objects.player.PlayerObject;
import resources.objects.tangible.TangibleObject;
import resources.common.*;
import resources.common.collidables.AbstractCollidable;
import resources.datatables.PlayerFlags;
import services.ai.LairActor;
import toxi.geom.Line3D;
import toxi.geom.Ray3D;
@@ -571,7 +572,8 @@ public class SimulationService implements INetworkDispatch {
ghost.toggleFlag(PlayerFlags.LD);
/*object.createTransaction(core.getCreatureODB().getEnvironment());
/*
object.createTransaction(core.getCreatureODB().getEnvironment());
core.getCreatureODB().put(object, Long.class, CreatureObject.class, object.getTransaction());
object.getTransaction().commitSync();*/
@@ -615,6 +617,10 @@ public class SimulationService implements INetworkDispatch {
PlayerObject ghost = (PlayerObject) object.getSlottedObject("ghost");
if (ghost.isSet(PlayerFlags.LD)) {
ghost.toggleFlag(PlayerFlags.LD);
}
core.weatherService.sendWeather(object);
if (!object.hasSkill(ghost.getProfessionWheelPosition())) {
@@ -622,8 +628,7 @@ public class SimulationService implements INetworkDispatch {
object.playEffectObject("clienteffect/skill_granted.cef", "");
object.playMusic("sound/music_acq_bountyhunter.snd");
core.skillService.addSkill(object, ghost.getProfessionWheelPosition());
}
}
}
public void transferToPlanet(SWGObject object, Planet planet, Point3D newPos, Quaternion newOrientation, SWGObject newParent) {