projectswg/NGECore2
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/NGECore2.git synced 2026-09-21 06:13:13 -04:00
Code Issues Projects Releases Wiki Activity

Merge

Browse Source
This commit is contained in:
Waverunner
2014-05-03 18:10:55 -04:00
parent e161871ee4 7860a8b668
commit 44678d8c18
12 changed files with 309 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/services/object/ObjectService.java
+2 -3
View File
@@ -916,9 +916,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() {