Gene Pressinger
b2e9accafe
Merged projectswg/holocore into quality_assurance
2016-06-09 14:11:34 -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
Obique PSWG
a675e308b7
Fixed transform issue after relog
2016-06-06 19:53:44 -05:00
Obique PSWG
b60e46e90b
Changed object awareness to mimic the behavior and stability of moveToContainer
2016-06-06 19:53:22 -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
Skyler Lehan
d53a40ba69
Fixed a concurrency issue with the group service removing two people at remotely the same time
2016-06-06 18:56:29 -04:00
Obique PSWG
95669189b5
Removed override of client's data transform speed
2016-06-06 11:22:52 -05:00
Obique PSWG
ee31170088
Improved DataTransform code in SWGObject
2016-06-06 10:54:54 -05:00
Obique PSWG
9b5f66fdec
Fixed zoning in to buildings
2016-06-06 10:21:41 -05:00
Obique PSWG
87cee94f2d
Fixed respawning outside and added a location map for generated objects
2016-06-06 09:09:34 -05:00
Obique PSWG
79f7048a92
Fixed errors in GroupObject
2016-06-06 08:08:29 -05:00
Obique PSWG
be90ee442b
Fixed players spawning back into buildings
2016-06-06 08:06:58 -05:00
Obique PSWG
703f6f44f2
Fixed slots, moveToContainer, and simplified awareness functions
2016-06-06 08:03:33 -05:00
Obique PSWG
e7f4616f9a
Made intent factory broadcasts sequential and added additional awareness debug to details.js
2016-06-06 08:00:56 -05:00
Obique PSWG
777b37af81
Fixed friends list updating right away
2016-06-06 07:58:11 -05:00
Obique PSWG
6534843fa4
Fixed null pointer using complicated owner/creature object code
2016-06-05 13:20:02 -05:00
Skyler Lehan
2d93905ebb
Converted GroupService to use a ScheduledExecutorService instead of a Timer
2016-06-04 22:36:40 -04: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
958d8bca18
Sped up sdb read
2016-06-02 06:26:24 -05: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
Skyler Lehan
434e82d3f4
Cleaned up the code and added a few more checks to most handler methods
2016-06-01 00:24:59 -04:00
Skyler Lehan
6fbafb4edd
Fixed a bug where if a player invited two other people, they would join separate groups, also fixed the "%TT has joined the group" message from showing twice.
2016-05-31 17:11:56 -04: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
1a58d05ca7
Attempted to implement uninvitation, as sending null inviter data does not close the invitation dialog
2016-05-30 21:29:16 -04:00
Skyler Lehan
b3a061355f
The kicked player now receives the correct message
2016-05-30 20:23:14 -04:00
Skyler Lehan
dd185c5741
The new leader message is now being sent, the sendGroupSystemMessage call has been fixed
2016-05-30 20:13:53 -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
d417b446d6
Added the declination messages sent to each character and handled the decline
2016-05-30 17:52:05 -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
c5bd7d1722
Fixed ID overwrite when reloading server
2016-05-30 15:04:39 -05:00
Obique PSWG
c788f58525
Fixed equipment transfer code
2016-05-30 15:03:37 -05:00
Obique PSWG
648844e287
Fixed equals in ContainerPermissions
2016-05-30 14:45:11 -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
007eb4136f
If the deserialization fails, so the loading will as well
2016-05-29 16:14:13 -05: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
Obique PSWG
928b6185ab
Optimized destroy to not save every time the odb updates
2016-05-26 11:43:07 -05:00