projectswg/NGECore2
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/NGECore2.git synced 2026-09-22 07:13:28 -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-04 18:56:34 +01:00
parent 6b50c6082b 44d45c236a
commit 541bffa942
103 changed files with 2142 additions and 250 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/services/object/ObjectService.java
+2 -3
View File
@@ -914,9 +914,8 @@ public class ObjectService implements INetworkDispatch {
if(!core.getConfig().getString("MOTD").equals(""))
creature.sendSystemMessage(core.getConfig().getString("MOTD"), (byte) 2);
BountyListItem bounty = (BountyListItem) core.getBountiesODB().get(creature.getObjectID());
if (bounty != null)
core.missionService.getBountyList().add(bounty);
if (core.getBountiesODB().contains(creature.getObjectId()))
core.missionService.getBountyList().add((BountyListItem) core.getBountiesODB().get(creature.getObjectId()));
if (creature.getSlottedObject("datapad") != null) {
creature.getSlottedObject("datapad").viewChildren(creature, true, false, new Traverser() {