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

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

Browse Source 
Conflicts:
	src/protocol/swg/ObjControllerMessage.java
	src/resources/objects/player/PlayerMessageBuilder.java
	src/services/travel/TravelService.java
This commit is contained in:
Light2
2014-03-10 00:42:19 +01:00
parent 807025ec0b 41d8fcf841
commit 52136c2b36
182 changed files with 2439 additions and 10372 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/services/object/ObjectService.java
+19 -15
View File
@@ -44,6 +44,7 @@ import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicLong;
import resources.common.*;
import resources.datatables.Options;
import resources.datatables.PlayerFlags;
import org.apache.mina.core.buffer.IoBuffer;
@@ -263,36 +264,39 @@ public class ObjectService implements INetworkDispatch {
objectList.put(objectID, object);
// Set Default Tangible Options
/*
// Set Options - easier to set them across the board here
// because we'll be spawning them despite most of them being unscripted.
// Any such settings can be completely reset with setOptionsBitmask
// in scripts and modified with setOptions(Options.X, true/false)
if (Template.startsWith("object/creature/") || Template.startsWith("object/mobile/")) {
((CreatureObject) object).setOptionsBitmask(Options.MOBILE);
if (Template.startsWith("object/mobile/beast_master/")) {
if (Template.startsWith("object/mobile/")) {
((CreatureObject) object).setOptionsBitmask(Options.ATTACKABLE);
} else if (Template.startsWith("object/mobile/beast_master/")) {
((CreatureObject) object).setOptionsBitmask(Options.NONE);
} else if (Template.startsWith("object/mobile/vendor/")) {
((CreatureObject) object).setOptionsBitmask(Options.INVULNERABLE | Options.USABLE);
} else if (Template.startsWith("object/mobile/vehicle/")) {
((CreatureObject) object).addOption(Options.INVULNERABLE | Options.MOUNT);
((CreatureObject) object).setOptionsBitmask(Options.ATTACKABLE | Options.MOUNT);
} else if (Template.startsWith("object/mobile/hologram/")) {
((CreatureObject) object).addOption(Options.INVULNERABLE);
((CreatureObject) object).setOptionsBitmask(Options.INVULNERABLE);
} else if (Template.startsWith("object/creature/npc/theme_park/")) {
((CreatureObject) object).addOption(Options.INVULNERABLE);
} else if (Template.startsWith("object/creature/general/")) {
((CreatureObject) object).setOptionsBitmask(Options.INVULNERABLE);
} else if (Template.startsWith("object/creature/npc/general/")) {
((CreatureObject) object).setOptionsBitmask(Options.INVULNERABLE | Options.CONVERSABLE);
} else if (Template.startsWith("object/creature/droid/crafted/")) {
((CreatureObject) object).setOptionsBitmask(Options.NONE);
} else if (Template.startsWith("object/creature/droid/")) {
((CreatureObject) object).addOption(Options.INVULNERABLE);
((CreatureObject) object).setOptionsBitmask(Options.ATTACKABLE | Options.INVULNERABLE);
} else if (Template.startsWith("object/creature/player/")) {
((CreatureObject) object).setOptionsBitmask(Options.ATTACKABLE);
}
} else if (object instanceof TangibleObject) {
((TangibleObject) object).setOptionsBitmask(Options.INVULNERABLE);
if (Template.startsWith("object/tangible/vendor/")) {
((CreatureObject) object).addOption(Options.USABLE);
} else if (Template.startsWith("object/creature/droid/")) {
((CreatureObject) object).addOption(Options.INVULNERABLE);
((TangibleObject) object).setOptionsBitmask(Options.INVULNERABLE | Options.USABLE);
}
}
*/
return object;
}
@@ -407,7 +411,7 @@ public class ObjectService implements INetworkDispatch {
}
});
objectList.remove(object.getObjectID());
//core.simulationService.remove(object, object.getPosition().x, object.getPosition().y);
core.simulationService.remove(object, object.getPosition().x, object.getPosition().y);
}