Commit Graph
2124 Commits
Author SHA1 Message Date
Iosnowore-Kun b80a7493d1 Merge pull request #4 from ProjectSWGCore/master
Update fork
2014-11-08 15:22:06 -05:00
wallaceg09 92deb58321 MODIFIED CreatureObject.setPosture to use refactored stopPerformance method 2014-11-07 22:04:37 -06:00
wallaceg09 88a0271216 MOVED stopPerformance code from CreatureObject to EntertainmentService
MOVED stopAudience code from CreatureObject to EntertainmentService
MODIFIED stopdance to utilize refactored stopPerformance code
MODIFIED stopmusic to utilize refactored stopPerformance code
2014-11-07 21:51:19 -06:00
wallaceg09 ea4c8f06f8 FIXED Incorrect music playing for each instrument
ADDED Player Ability check to playing music
ADDED Player notification messages for failed music performance checks
ADDED 'canPerform' method to EntertainmentService
ADDED 'getAvailableSongs' method to EntertainmentService
2014-11-07 14:31:59 -06:00
wallaceg09 d04c8c11cc Added getInstrument method to EntertainmentService 2014-11-07 14:31:54 -06:00
wallaceg09 bfc1653d68 Refactored EntertainmentService to to allow music to function properly
Modified startdance script to work with the refactored EntertainmentService
2014-11-07 14:31:53 -06:00
wallaceg09 1b343a7f3a Fixed comments that were removed by accident 2014-11-04 08:21:10 -06:00
wallaceg09 8488bd5037 Fixed an issue where equipping an item on top of a set-bonus item wouldn't remove the set buff. 2014-11-04 08:13:17 -06:00
Iosnowore Kun d5d3fa49f2 Fixed some warnings in ObjectService 2014-11-02 14:22:06 -05:00
wallaceg09 0fb7aa97cb FIXED bug 0000248: Incorrect Heroism Jewelry set buffs. 2014-11-01 15:42:45 -05:00
Undercova b64acae587 Update ObjectService.java 2014-10-28 16:06:26 +01:00
Bronco69 7ca52ec121 Added new player zone-in-area
- Added a new terminal with teleport function to any town in the galaxy
- Changed initial spawn position to "Umbra" to reduce chance of crashes
- Added a teleport terminal to admin commands in frog menu
2014-10-27 07:53:29 +01:00
Waverunner db02c81261 Added null parent destination check for cell permissions, Deprecated checkForReservedNames, Fixed characters not in odb showing up in characters datatable, Removed updating of highestid in datatables until persistence is fixed in odb's 2014-10-22 13:17:56 -04:00
Waverunner ba70448f80 Added null checks for objects before sending bytes in SWGList 2014-10-22 10:44:00 -04:00
CharonInferar 09e56d4e6e Merge remote-tracking branch 'origin/master' into ObjectServiceFix 2014-10-11 20:48:09 +02:00
CharonInferar 453604afb3 Attempt to fix appearance flicker issue 2014-10-11 20:46:15 +02:00
Zing fca1185e3f Merge pull request #1247 from zingzing175/master
Updated (re-added) appearance inventory container
2014-10-09 18:29:36 -07:00
Zing 4ac3c05005 Updated (re-added) appearance inventory container 2014-10-09 18:28:29 -07:00
CharonInferar e4bb10b9b8 Fixed database access problems in terrainservice
Killed multi-threaded planet buildout loading because it caused some
objects not being loaded due to concurrency problems in the database ORM
binder. Sleepycat runs better when accessed with a single thread.
Fixed stream buffer overload error resulting in illegalstateexception in
playerservice check method.
2014-10-09 21:42:20 +02:00
CharonInferar 2475675ccf Fixed static service bug, tweaked buildout loading
Plus fixed some static spawn script errors
2014-10-08 21:52:21 +02:00
CharonInferar 576ddbe93c Fixed dancing bug due to class-cast error 2014-10-08 18:09:12 +02:00
CharonInferar 7414209381 Hotfix for equipment-related crash issue
Persisted player equipment objects were not managed at all by the
objectservice collection upon reload leading to inconsistencies.
2014-10-06 21:30:48 +02:00
CharonInferar 835e9f5fe4 Added the check in more places 2014-10-05 22:05:01 +02:00
CharonInferar df3d11779c Added check to ObjectService
Makes it easier to differentiate if an object is really missing from
objectList from the check in select character that checks for the object
in the list.
2014-10-05 21:47:08 +02:00
tacef 0552114a72 Merge pull request #1235 from CharonInferar/ErrorDiagnostic
Fixed getBytes() exception
2014-10-05 19:10:06 +02:00
CharonInferar e863548182 Fixed getBytes() exception
Only objects that are in objectList are added to the Quadtree. Prevents
later errors where the quadtree objects would not be found in
objectList. After all such objects should not even be around, but well
...
2014-10-05 18:48:34 +02:00
Matt Parnell 0670c84785 another potential fix 2014-10-05 03:23:01 -05:00
Matt Parnell 6e3fdb7304 longs when null equate to 0L 2014-10-05 02:22:30 -05:00
Matt Parnell 6e2e6beab3 more error handling for null creatures 2014-10-05 02:15:42 -05:00
Matt Parnell a7d5e0d2fd is the object null? 2014-10-05 01:59:48 -05:00
Matt Parnell 998b1d9e39 fix what appears to be a bug 2014-10-05 01:52:16 -05:00
Matt Parnell a549bedd6b avoid errors 2014-10-05 01:24:59 -05:00
Matt Parnell 23bdbcb0ef had my logic reversed, need more coffee 2014-10-05 01:22:28 -05:00
Matt Parnell ca1f3fd6b8 staticservice fix, hopefully 2014-10-05 01:21:10 -05:00
Matt Parnell 0a60cf3c7a dump the stack 2014-10-05 01:13:27 -05:00
Matt Parnell 9fb4c11d29 debugging... 2014-10-05 01:07:23 -05:00
Matt Parnell d2f81b7dc4 proper return val on null 2014-10-05 01:02:02 -05:00
Matt Parnell 572cb9c128 fix something stupid 2014-10-05 01:00:12 -05:00
Matt Parnell d8f47c6236 this seems more logical...it's returned as an SWGObject, how can it be anything else? 2014-10-05 00:47:14 -05:00
Matt Parnell 02a9581ccf attempt an equipment fix...may be able to remove the typecasting and just use object up top? 2014-10-05 00:42:16 -05:00
Matt Parnell b44c1ab13b fix my comparison 2014-10-05 00:37:03 -05:00
Matt Parnell 3c1480b891 try this then 2014-10-05 00:34:56 -05:00
Matt Parnell e3d63a872e attempt a sanity check 2014-10-05 00:29:52 -05:00
Zing c2e26f40fd Small test for crash 2014-10-02 18:32:22 -07:00
CharonInferar 0ce1a0a4f6 Merge pull request #1226 from CharonInferar/FixFixFix
Fixed buildouts loading order and assembly
2014-09-29 02:44:49 +02:00
CharonInferar 2627425bf8 Fixed buildouts loading order and assembly
All Cells are first instantiated and then added to their parent
buildings
2014-09-29 02:41:07 +02:00
Zing a58bd0a92c Updated Insipred Action 2014-09-28 16:28:38 -07:00
Zing 12e5b5c355 Added Officer Inspired Action 5PC random buff. 2014-09-28 01:20:01 -07:00
CharonInferar f47c642619 Debug msg removed 2014-09-27 20:48:43 +02:00
CharonInferar 59fcbe7d1f Fixes appearance inventory overload
Appearance items can now be correctly equipped after server
restart/relog.
2014-09-27 20:47:40 +02:00