Commit Graph
30 Commits
Author SHA1 Message Date
Skyler Lehan 6de3955439 Removing comment 2016-07-14 17:26:10 -04:00
Skyler Lehan 8521ae73ac NGE-111: fixed an issue with %TT being sent instead of the proper message, and temp fix to passing leadership 2016-07-12 19:35:35 -04:00
Skyler Lehan 12038023c7 Fixed remaining issues in the PR for NGE-111 2016-07-05 18:07:14 -04:00
Skyler Lehan 223505257d Fixed issues in PR #229
groupMakeMasterLooter.js/groupUninvite.js
- Fixed issues with unnecessary spaces

GroupObject
- fixed unnecessary line breaks
- refactored loot rule from an int into an enum
- fixed sub int spacing
- fixed name on getLeaderId

GroupService
- fixed ScheduledExecutorService so that there is only one, and it spawns threads and puts the Future in the map of CreatureObject to Future
- changed types for logoffTimers to a map
- commented out the loot stuff for now
- refactored a good chunk of handleInvite to another method
2016-06-19 20:06:51 -04:00
Skyler Lehan 6cb69ebd43 Made some formatting changes to GroupObject 2016-06-07 07:27:13 -04:00
Skyler Lehan dcce3068a9 Went through and fixed any formatting changes, and made sure it was thread safe. 2016-06-07 07:24:33 -04:00
Skyler Lehan cfe88e0032 Merge branch 'quality_assurance' of bitbucket.org:projectswg/holocore into groups
# Conflicts:
#	src/resources/objects/group/GroupObject.java
2016-06-06 19:25:02 -04:00
Obique PSWG 79f7048a92 Fixed errors in GroupObject 2016-06-06 08:08:29 -05:00
Skyler Lehan 337ccd4b37 Fixed a few bugs in regards to the automatic logout group removal and fixed some duplicate messages being sent. 2016-06-02 17:33:13 -04:00
Skyler Lehan 124bb68220 Added handling for looting and loot master setting, however the makeMasterLooter command is not being seen by holocore 2016-05-30 19:54:48 -04:00
Skyler Lehan 7203cf6310 Fixed the issue with getting the disband message twice
GroupObject
- getGroupMemberObjects() returns a HashSet now

GroupService
- uses a HashSet for sendGroupSystemMessage
2016-05-30 14:25:39 -04:00
Skyler Lehan abc0b640fb More work for NGE-111, mostly minor fixes
GroupObject
- fixed some formatting issues
- added method to get the CreatureObjects of each GroupMember in the group
- removed mark/unmarkPlayerForLogoff and the TimerTask for them (moved to GroupService instead)

GroupService
- fixed the message sending methods
- GroupService now tracks if players log in and out and removes them as necessary

- still need to make sure the "disband" message is only being sent once, this stems from the leader being in GroupMembers twice
- need to make sure all appropriate messages are being sent to the players, like when leadership changes etc
2016-05-30 13:34:49 -04:00
Skyler Lehan 6f467523a4 GroupObject
- remove member is now checks to make sure that if one of two GroupMembers leaves, then the group should disband
- added method disbandGroup to destroy the group

GroupService
- instead of doing its own disbanding, that responsibility was refactored to GroupObject
2016-05-29 19:15:46 -04:00
Skyler Lehan b3f57bbdb5 Merge branch 'quality_assurance' of bitbucket.org:projectswg/holocore into groups 2016-05-29 17:47:40 -04:00
Skyler Lehan b7df083dad Changed GroupMember to wrap a CreatureObject 2016-05-29 17:46:52 -04:00
Obique PSWG d9e3ef41f7 Welcome to the new world of serialization. Beware 2016-05-29 14:23:29 -05:00
Skyler Lehan c0272cc4fc Made it so that when a player logs off, they're removed from the group in 4 minutes
GroupObject
- added a hashmap of a timer to a GroupMember
- changed removeMember to handle setting leader to the next most recent joiner
- refactored setLeader out to changeLeader, and added a way of setting a leader with a GroupMember object
- added method getGroupMember that will return a given GroupMember based on the player passed to it, if that Player is in the groupMember list
- added method markPlayerForLogoff which will start a timer for that player, when the timer fires, that character/player is removed from the group
- added method unmarkPlayerForLogoff which will cancel the timer to prevent that player from logging off
- added class LogOffTask which will be used in the Timer as a task

GroupService
- changed from watching for a player disappearing to one logging out
- when the player zones in, it will unmark it for logoff
- also handle if the player logs off by marking that player as logged off
2016-05-27 00:22:00 -04:00
Skyler Lehan 2ae16b29d5 Corrected the instanceof 2016-05-26 00:08:48 -04:00
Skyler Lehan 82336c90f3 Changed equals for GroupObject to use instanceof 2016-05-25 22:33:18 -04:00
Skyler Lehan 4aa7c881ae Added Obi's change for removeCustomAware 2016-05-25 22:10:01 -04:00
Skyler Lehan 4ee608b992 Fixed awareness for GroupObject 2016-05-25 21:36:29 -04:00
Obique PSWG d9bb7b928f Changed baseline/deltabuilder to be solely created by BaselineObject 2016-01-31 17:33:04 -06:00
Obique PSWG 597a40d702 Fixed build error with previous commit 2016-01-07 14:57:36 -06:00
Waverunner e1e2210678 Fixed group members not properly displaying themselves in a group when relogging 2015-12-11 10:49:34 -05:00
Obique PSWG 6b7a746199 Fixed some transient variable errors as well as ODB loading etiquette 2015-10-13 22:11:58 -05:00
Waverunner 72dc61b730 Fixed compile errors from merge 2015-10-13 10:02:35 -04:00
Waverunner 4c1b895298 Added core grouping system for CORE-111 - Groups are now implemented 2015-10-13 09:35:18 -04:00
Waverunner b49b544af2 Added in basic ability to join groups 2015-10-05 17:39:02 -04:00
Obique PSWG 58968838d2 Fixed all warnings 2015-06-10 21:33:06 -05:00
Waverunner fc52a4be46 Added baselines for GroupObject and minor location improvement for /waypoint command 2015-06-07 13:51:30 -04:00