merge fixes

This commit is contained in:
Light2
2014-05-01 21:27:16 +02:00
parent 6cd794a6c3
commit ce55d15e97
4 changed files with 20 additions and 23 deletions
+1 -1
View File
@@ -270,7 +270,7 @@ public class ConnectionService implements INetworkDispatch {
}
}*/
core.missionService.getBountyList().remove(core.getBountiesODB().get(object.getObjectId(), Long.class, BountyListItem.class));
core.missionService.getBountyList().remove(core.getBountiesODB().get(object.getObjectId()));
ghost.toggleFlag(PlayerFlags.LD);