Commit Graph
337 Commits
Author SHA1 Message Date
Skyler Lehan b7df083dad Changed GroupMember to wrap a CreatureObject 2016-05-29 17:46:52 -04: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
Obique PSWG 338eb1145d Added license to a few files 2016-05-24 11:50:02 -05:00
Obique PSWG da71dd34f5 Fixed NGE-395 'New characters dont crash spawned in characters anymore' 2016-05-24 09:43:42 -05:00
Obique PSWG 6c4d21ecb7 Fixed various baseline variables in PlayerObject 2016-05-24 09:42:31 -05:00
Obique PSWG 123787d481 Fixed tangible object flags 2016-05-24 09:41:00 -05:00
Obique PSWG d1fdcbf84f Fixed players flickering upon zone in 2016-05-24 09:40:30 -05:00
Obique PSWG a202c0334e Fixed server time 2016-05-20 15:35:54 -05:00
Obique PSWG fa11bfe49e Changed setOwner to also call Player.setCreatureObject 2016-05-19 16:20:34 -05:00
Obique PSWG fe738b2869 Merge branch 'quality_assurance' of bitbucket.org:projectswg/holocore into quality_assurance 2016-05-18 21:09:29 -05:00
Obique PSWG 381635895f Updated awareness/observers and deprecated addObject/removeObject 2016-05-18 21:08:43 -05:00
Obique PSWG 201fc03cf3 Fixed LD issue 2016-05-18 20:42:19 -05:00
Obique PSWG cb981d7029 Merged in M4SS/holocore/weapon-equip (pull request #224)
Added support for equipping/unequipping weapons
2016-05-18 15:41:36 -05:00
Mads Boddum 63ba8b59ec Added support for equipping/unequipping weapons 2016-05-18 13:23:38 +02:00
Obique PSWG c05f6e9a08 Removed annoying AIObject printouts 2016-05-17 15:45:24 -05:00
Obique PSWG 44c880515d Fixed hilarious bug in DefaultAIObject where it was looking for the wrong locations 2016-05-17 01:41:29 -05:00
Obique PSWG 068d51c441 Added AI GUARD and made distance calculations "flat" 2016-05-16 20:07:43 -05:00
Obique PSWG 743d08d25f Refactored the SWG collections 2016-05-16 20:05:18 -05:00
Obique PSWG 072e055d8f Added observers output to the details script 2016-05-16 10:13:17 -05:00
Obique PSWG e6e8643f3f Fixed observers in buildings 2016-05-16 00:00:19 -05:00
Obique PSWG 4577fd826c Redid observers and awareness and fixed NPCs inside buildings 2016-05-15 17:14:55 -05:00
Obique PSWG d7d3dbf699 Merge branch 'quality_assurance' of bitbucket.org:projectswg/holocore into quality_assurance 2016-05-14 16:59:13 -05:00
Obique PSWG e84b4b5557 Fixed NPC rotation and movement 2016-05-14 16:58:52 -05:00
Mads Boddum 9029e4c12c Fixed an issue where a delta for CreatureObject.skills was sent regardless of modification and a concurrency issue 2016-05-14 19:40:00 +02:00
Obique PSWG 9a4bde8ec6 Significantly reduced the amount of CPU used by AI 2016-05-14 11:43:23 -05:00
Obique PSWG 00758ce6c6 Fixed save issue with AIObject 2016-05-13 21:33:00 -05:00
Obique PSWG 0946736811 Stopped setLevel from requiring a cast 2016-05-13 18:45:53 -05:00
Obique PSWG 842dfdf136 Changed a majority of Holocore to use the Log class 2016-05-13 17:36:59 -05:00
Obique PSWG 8753085dfb Fixed FLOAT inside buildings and added the radius 2016-05-13 16:23:25 -05:00
Obique PSWG b111e53941 Created an AIBehavior enum 2016-05-13 15:39:49 -05:00
Obique PSWG dbb1af12b3 Merge branch 'experience' of bitbucket.org:projectswg/holocore into quality_assurance
Conflicts:
	src/resources/objects/creature/CreatureObject.java
	src/services/galaxy/GameManager.java
2016-05-13 15:38:57 -05:00
Obique PSWG cb4354d39f When in combat the AI no longer moves 2016-05-13 14:21:17 -05:00
Obique PSWG 1066ad871b Added basic AI float 2016-05-13 12:45:10 -05:00
Obique PSWG 0d3763b813 Small improvement to observers in SWGObject 2016-05-13 12:31:08 -05:00
Obique PSWG c1c106a457 Created AIObject and integrated it into ObjectManager 2016-05-13 01:04:52 -05:00
Obique PSWG f81f7ccc06 Fixed HAM bar not showing up 2016-05-11 13:26:56 -05:00