projectswg/NGECore2
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/NGECore2.git synced 2026-10-14 04:13:14 -04:00
Code Issues Projects Releases Wiki Activity
3,579 Commits 11 Branches 4 Tags
e2bbc1b6764ba9a467a2471cea9eb4c42e52e13b
Commit Graph
3579 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Matt Parnell e2bbc1b676 only select the bit we need 2014-08-20 23:26:43 -05:00
Matt Parnell 6a73772b1c copypasta mistake 2014-08-20 23:23:39 -05:00
Matt Parnell 86c972f7de sql cleanups - be verbose in our selections, always parameterize 2014-08-20 23:10:38 -05:00
Matt Parnell 9179a26e9a Merge remote-tracking branch 'upstream/master' 2014-08-20 22:07:33 -05:00
Obique 8973348aa6 Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-08-20 21:16:05 -05:00
Obique 052e1b3227 Updated engine b'cause Zing told me to 2014-08-20 21:15:35 -05:00
Matt Parnell 9fdfccd7c6 Merge remote-tracking branch 'upstream/master' 2014-08-20 18:16:59 -05:00
Treeku 2e56f78b2b Fixed issue with commands randomly breaking. 2014-08-20 21:50:04 +01:00
Treeku df0654d901 See update notes... 
- Fixed issue where health/action didn't update anymore after incapacitation.
 2014-08-20 21:07:12 +01:00
Treeku dd2afae373 Fixed various problems that occur after rebooting. 
Fixes SWGMap objectMutex issues.

Fixes this buff error received after rebooting the server:

java.lang.NullPointerException
at resources.objects.SWGMap.values(SWGMap.java:284)
at services.BuffService.clearBuffs(BuffService.java:376)
at services.object.ObjectService$7.handlePacket(ObjectService.java:1149)
at engine.resources.service.NetworkDispatch$1.run(NetworkDispatch.java:216)
at java.util.concurrent.ThreadPoolExecutor.runWorker(Unknown Source)
at java.util.concurrent.ThreadPoolExecutor$Worker.run(Unknown Source)
at java.lang.Thread.run(Unknown Source)
 2014-08-20 19:31:40 +01:00
Treeku ac982e2e8b Fixed various problems that occur after rebooting. 
Fixes SWGList objectMutex issues.
 2014-08-20 19:15:18 +01:00
Treeku 9c488122a1 Fixed various problems that occur after rebooting. 
Fixes SWGMultimap objectMutex issues.
 2014-08-20 19:11:10 +01:00
Treeku 8f7d84bc35 Fixed various problems that occur after rebooting. 
Fixes SWGSet objectMutex issues.
 2014-08-20 19:05:58 +01:00
Treeku 6eaa6fcd14 See extended for update notes... 
- Fixed issue where player couldn't stop watching an ent.

Dev info:

ConnectionService:disconnect(): Error disconnecting client.
java.lang.NullPointerException
at resources.objects.creature.CreatureObject.setPerformanceWatchee(CreatureObject.java:1076)
 2014-08-20 04:57:21 +01:00
Matt Parnell c89c15eb28 Merge branch 'master' of github.com:ilikenwf/NGECore2 2014-08-19 21:20:09 -05:00
Matt Parnell 706029fb81 Merge remote-tracking branch 'upstream/master' 2014-08-19 21:19:44 -05:00
Treeku 5eb0ee8465 Fixed issue where health and skills didn't update. 
Fixed:

1: Player and creature/npc HAM does not update.
2: On initial character zone in, you do not receive HAM for level 5. you are stuck at 1000/308. I believe that is for level 1. A relog will fix this. You also do not receive your starter commands, unless you relog.
3: During combat player and target HAM do not update but you do give and receive damage via the combat log (and the target can be killed) If you logoff and back in again during combat you can see the HAM changes to that point but they will not move again unless you relog again.
4: if you use the travelService (teleport, shuttle, etc) everything will update once as well. Will not update again unless you travel again.
 2014-08-20 02:29:38 +01:00
Treeku 246d51b4ac See extended for update notes... 
- Fixed issue where player couldn't stop listening to an ent.

Dev info:

ConnectionService:disconnect(): Error disconnecting client.
java.lang.NullPointerException
at resources.objects.creature.CreatureObject.setPerformanceListenee(CreatureObject.java:1092)
 2014-08-20 02:02:33 +01:00
Matt Parnell 59e012b17a Don't ignore .classpath after all, it breaks things 2014-08-19 08:49:06 -05:00
Matt Parnell fcefe79ba0 remove unnecessary nested if 2014-08-18 23:04:19 -05:00
Matt Parnell 1f899f9851 fix some SQL issues where we were grabbing way too much data than we needed for our results 2014-08-18 23:02:58 -05:00
Matt Parnell f7512b27c3 replace use of select wildcard, which uses more DB resources with a call to count the number of characters an account has in CharacterService.java 2014-08-18 22:55:02 -05:00
Matt Parnell 9718715a17 comment on issue with reserved name filter - it just doesn't work. 2014-08-18 22:47:47 -05:00
Matt Parnell 4ba5303b24 autoformat the Forager.java file as it was a little difficult to read 2014-08-18 22:32:26 -05:00
Matt Parnell b6fb961c70 tag TODO on a Forager item - where buffs affect the forage 2014-08-18 22:28:33 -05:00
Matt Parnell 952d57afeb convert multiple if/else if statements into switch for buff category on BuffBuilder.java 2014-08-18 22:27:12 -05:00
Matt Parnell a54707307f this is the actual merge of the two if statements - autoformat happened on the first 2014-08-18 22:21:55 -05:00
Matt Parnell 38474bee35 merge nested if statements with no elses in Buff.java 2014-08-18 22:19:32 -05:00
Matt Parnell 23a0dd4e60 autoformat unittest.java 2014-08-18 22:11:39 -05:00
Matt Parnell c5331c063d clean up formatting on message.java 2014-08-18 22:11:13 -05:00
Matt Parnell 49a0279a54 Merge remote-tracking branch 'upstream/master' 
Conflicts:
	src/main/NGECore.java
 2014-08-18 22:02:19 -05:00
Viaron 0498aceb0e Merge pull request #1179 from zingzing175/master 
Fixed Some Admin commands not working on file systems other than windows. Added blocks to admin commands with godLevel of 0.
 2014-08-17 21:34:42 -04:00
CharonInferar 557764bc50 Merge pull request #1180 from CharonInferar/Fixes2 
Fixed AI-consideration in command service
 2014-08-17 14:39:32 +02:00
CharonInferar cb6bbe37ea Removed debug messages 2014-08-17 14:35:17 +02:00
Waverunner ae9126ad75 Merge pull request #1178 from ProjectSWGCore/TacefEntertainer 
Entertainermissions
 2014-08-17 07:59:23 -04:00
CharonInferar 400a72eb7c Merge remote-tracking branch 'origin/master' into Fixes2 2014-08-17 13:30:28 +02:00
CharonInferar a52d01652c Fixed broken command service 2014-08-17 13:28:23 +02:00
Zing 47756a09ae Fixed Admin Command. Missed one 2014-08-17 01:23:11 -07:00
Zing 6de085b3da Fixed Admin commands part2 2014-08-17 01:18:34 -07:00
Zing 5edce825ff Fixed Some Admin commands not working on file systems other than windows 2014-08-17 01:17:03 -07:00
tacef f34a950b29 Merge pull request #1177 from tacef/EntertainerMissions 
Fixed some minor things in EntertainerMissionsObjective
 2014-08-17 09:09:36 +02:00
tacef 745ee6d2eb Fixed some minor things in EntertainerMissionsObjective 2014-08-17 09:08:44 +02:00
tacef f2f4a7e1a6 Merge pull request #1176 from tacef/EntertainerMissions 
Changed EntertainerMissionObjective
 2014-08-17 08:37:06 +02:00
tacef 41406703b1 Changed EntertainerMissionObjective 2014-08-17 08:36:01 +02:00
Matt Parnell 1a8ad79083 forgot to turn this into a string 2014-08-17 01:01:34 -05:00
Matt Parnell a57120f7ce replace the call to cleanupCreatureODB in the start function, though it is now in the cleanup function as well..also added comment that will help in speeding it up sometime (TODO) 2014-08-17 00:43:54 -05:00
Matt Parnell 42bfacb76d move creature cleanup to the cleanUp() function 2014-08-16 23:36:19 -05:00
Matt Parnell 0543b60bb1 change the order and formatting of NGECore.java to make it more readable and logically sensible 2014-08-16 23:35:23 -05:00
Matt Parnell d1cae8b0b1 Update readme fix the last number as it was turning into 1 for some reason 2014-08-16 23:19:32 -05:00
Matt Parnell c33294f960 link to the video tutorial 2014-08-16 23:08:34 -05:00