Commit Graph
371 Commits
Author SHA1 Message Date
Obique PSWG ddd9fa3b16 Merge branch 'quality_assurance' of bitbucket.org:projectswg/holocore into quality_assurance 2016-07-13 08:12:05 -05:00
Obique PSWG dc0d8f0708 Fixed many awareness and observer issues 2016-07-13 08:11:34 -05:00
Obique PSWG 15953f1065 Fixed pvp flags and posture messages sending with buildouts or snapshots 2016-07-13 07:45:52 -05:00
Obique PSWG 835e0e8266 Merged in slehan/holocore/groups (pull request #229)
Groups
2016-07-10 05:41:04 -05: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
Obique PSWG b1fc65207b Ordered SWGObject attributes and fixed terrain in getWorldLocation 2016-06-12 10:03:07 -05: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
Obique PSWG a675e308b7 Fixed transform issue after relog 2016-06-06 19:53:44 -05: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 ee31170088 Improved DataTransform code in SWGObject 2016-06-06 10:54:54 -05:00
Obique PSWG 79f7048a92 Fixed errors in GroupObject 2016-06-06 08:08:29 -05:00
Obique PSWG 703f6f44f2 Fixed slots, moveToContainer, and simplified awareness functions 2016-06-06 08:03:33 -05:00
Obique PSWG 777b37af81 Fixed friends list updating right away 2016-06-06 07:58:11 -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
Obique PSWG 43af96e047 Re-did container permissions 2016-06-02 06:01:55 -05:00
Obique PSWG 1652656bcb Fixed equipment list bug 2016-06-01 08:53:48 -05:00
Obique PSWG 6a56c4ff15 Fixed equip/unequip into inventory 2016-05-31 12:03:33 -05:00
Obique PSWG f2f7e35177 Fixed CREO equipment and SWGObject.removeObject 2016-05-31 11:38:20 -05: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
Obique PSWG 681386f326 Added backwards compatability with version 1 2016-05-30 16:29:50 -05:00
Obique PSWG 27a50d6b4e Increased QuadTree sensitivity slightly 2016-05-30 15:53:16 -05:00
Obique PSWG c788f58525 Fixed equipment transfer code 2016-05-30 15:03:37 -05:00
Obique PSWG ffb158db7d Decreased QuadTree sensitivity 2016-05-30 14:20:47 -05: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
Obique PSWG 83d4ae2098 Fixed a weird issue with object IDs generated overlapping others 2016-05-30 09:21:23 -05:00
Obique PSWG 576b2bd8be Added parent to serialized output 2016-05-30 00:16:48 -05: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
Obique PSWG 6c3e0c612c Fixed NGE-397 'Deleted characters get removed properly' 2016-05-29 17:55:44 -05: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
Obique PSWG f2aa2af65a Fixed equipping/unequipping inside buildings 2016-05-27 12:06:56 -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 d950f3c33e Merge branch 'quality_assurance' of bitbucket.org:projectswg/holocore into groups 2016-05-26 00:33:27 -04:00
Obique PSWG b7c8e72ee5 Fixed issue where not both custom awareness sets were cleared 2016-05-25 23:31:51 -05:00
Skyler Lehan 3ee5a34a5b Merge branch 'quality_assurance' of bitbucket.org:projectswg/holocore into groups 2016-05-26 00:09:08 -04:00
Skyler Lehan 2ae16b29d5 Corrected the instanceof 2016-05-26 00:08:48 -04:00
Obique PSWG 04716ab64c Updated some custom awareness logic 2016-05-25 22:31:06 -05: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 5b9f7beeae Merge branch 'quality_assurance' of bitbucket.org:projectswg/holocore into groups 2016-05-25 21:36:51 -04:00
Skyler Lehan 4ee608b992 Fixed awareness for GroupObject 2016-05-25 21:36:29 -04:00
Obique PSWG b7283cad0c Added a clearCustomAware method 2016-05-25 20:33:39 -05:00
Obique PSWG 50ab1dd891 Fixed equipping and unequipping for observers 2016-05-25 12:46:44 -05:00
Obique PSWG 9dcd8b7740 Added createObject/destroyObject 2016-05-24 21:44:03 -05:00
Obique PSWG 6bd4a10c99 Changed custom observers to custom aware 2016-05-24 21:36:05 -05:00
Obique PSWG a9d3dcff5d Created custom observers set 2016-05-24 13:11:44 -05:00