Commit Graph

375 Commits

Author SHA1 Message Date
Chomp 88c9f71f8c Fixed AdjustWeighting not correctly ignoring items in the edit list not found at the destination
Added nullguards
Added missing comment
Simplified if statement
2025-05-30 12:47:01 +01:00
Chomp 4f01dc54bd Merge branch 'develop' of https://github.com/sp-tarkov/server-csharp into develop 2025-05-30 12:36:46 +01:00
Chomp 866a5fd24c Minor bot equipment code changes
Assume player is level 1, not 0
Nullcheck bot equipment config prior to using it
2025-05-30 12:35:23 +01:00
clodanSPT ee51e1fcab Refactored pre spt mod loader to user IOnLoad, moved Watermark to IOnLoad as well (#313)
Co-authored-by: Alex <alex@dm-me-for-questions.com>
2025-05-30 11:03:08 +01:00
Chomp 1aa9bc3f2f Merge pull request #304 from sp-tarkov/async-refactor
Program initialization change & webserver async
2025-05-30 10:00:53 +01:00
Chomp a12deb3839 Merge branch 'develop' of https://github.com/sp-tarkov/server-csharp into develop 2025-05-30 09:25:51 +01:00
Chomp d2e80d7b5d Updated GetItemRewardPool to ignore items from the db without a parent id when gathering blacklist 2025-05-30 09:24:43 +01:00
clodanSPT a491b8de1b OnLoadOrder sort (#311)
Co-authored-by: Alex <alex@dm-me-for-questions.com>
2025-05-30 09:04:50 +01:00
Archangel 7d0c8dfc38 Rename parameters with underscore 2025-05-29 23:50:06 +02:00
Archangel cc4f1f2964 Remove assignments as requested 2025-05-29 23:50:06 +02:00
Archangel 8e69bd4aec Await disposal 2025-05-29 23:50:06 +02:00
Archangel 5ddeee30bb Fix issue with renaming 2025-05-29 23:50:06 +02:00
Archangel fa1368fb47 Move more initialization, mod loading and http requests over to async 2025-05-29 23:50:06 +02:00
Archangel c930197942 Cleanup AppContext 2025-05-29 23:50:06 +02:00
Archangel 6f3244362c Make sure value is not null 2025-05-29 23:50:06 +02:00
Chomp b07fb37312 Merge pull request #309 from cp89gamedev/fix-broken-test
theres a chance that 0 equals 0
2025-05-29 22:18:43 +01:00
Chris Adamson 1946199f61 theres a chance that 0 equals 0 2025-05-29 15:48:59 -05:00
Chomp bd1326b708 Merge pull request #308 from cp89gamedev/fix-broken-test
fix for broken math test
2025-05-29 21:19:55 +01:00
Chris Adamson ff43f72b53 yuck math 2025-05-29 14:47:42 -05:00
Chomp ad999a81d2 Merge pull request #306 from cp89gamedev/fix-broken-test
fixed issue with setter not handling null values exposed by failing u…
2025-05-29 20:44:06 +01:00
Chris Adamson 5db0fd575b fixed issue with setter not handling null values exposed by failing unit test 2025-05-29 14:01:16 -05:00
Cj 74cc1ac300 Move repeatable quest code into repeatable controller 2025-05-29 14:56:14 -04:00
Cj ab1886f3ab Fix comment formatting 2025-05-29 13:31:57 -04:00
Chris Adamson 541f326409 added a lock for trader buy method (#303)
* added a lock for trader buy method

* moved the lock higher
2025-05-29 17:25:09 +01:00
Jesse 636e250085 Handle AlreadyRunning with TcpListener to stop tons of exceptions (#302)
* Handle AlreadyRunning with TcpListener to stop tons of exceptions

* Use same properties as web server
2025-05-29 12:56:37 +01:00
Chomp 7ec684aa7e Fixed issue with websockets not reconnecting post-raid
We no longer remove old websocket connections

Converted `SptWebSocketConnectionHandler` to use a primary constructor

Removed websocket monitor from `SptWebSocketConnectionHandler`
2025-05-29 11:55:30 +01:00
clodanSPT 1968afccba Fixes and logs (#301)
* Added safety checks around dictionary lookups for Areas Stages

* Added lots of debug logs for websocket handling

* Removed debug comments

---------

Co-authored-by: Alex <alex@dm-me-for-questions.com>
2025-05-29 11:06:32 +01:00
Jesse d079e86fcb Add OnLazyLoad event so modders can modify LazyLoaded data (#297)
* Add OnLazyLoad event so modders can modify LazyLoaded data

* Remove whitespace
2025-05-29 11:05:41 +01:00
hulkhan22 44d881b793 Fix unordered enumerable 2025-05-28 23:12:59 +02:00
Chris Adamson df5750cf09 fixes for my previous pr based on peer feedback 2025-05-28 15:01:10 -05:00
CWX deaa2d8530 Merge branch 'develop' into just-oblivion-memes 2025-05-28 20:41:54 +01:00
Chris Adamson ccd3498d2c I used have spt dev role but then I took an arrow to the knee 2025-05-28 14:38:08 -05:00
Chris Adamson 7d85c0af22 added horse armor 2025-05-28 14:29:57 -05:00
Chris Adamson 173fc6b8a9 I saw a mudcrab the other day. Horrible creatures 2025-05-28 13:47:13 -05:00
CWX 30231964db Add culture Conversion with string to number converter, fixes strings with numbers and commas 2025-05-28 18:54:07 +01:00
Chomp 972dd997fc Fixed null being thrown when searching for an item that has no offers requiring it 2025-05-28 18:25:14 +01:00
Chomp 387970890d Fixed flea categories not showing when performing a 'required' search 2025-05-28 18:24:34 +01:00
Chomp 7f82fdbe1f Minor cleanup 2025-05-28 17:05:19 +01:00
Chomp a7412384cd Fixed Linked Search not working for caratridges 2025-05-28 17:04:57 +01:00
Chomp c110783269 Minor cleanup of post-raid fence standing calculations inside HandlePostRaidPlayerScav 2025-05-28 12:37:07 +01:00
Chomp a3c3cad825 Fixed scav runs not setting loot to non-FIR after runthrough #279 2025-05-28 12:28:02 +01:00
Chomp da42c2803a Comment improvements 2025-05-28 12:04:27 +01:00
Alex c0dbcc3d66 Changed object in favor of Lock 2025-05-28 11:55:44 +01:00
Chomp 74a5310de0 Added nullguards surrounding laser and nvg checks 2025-05-28 11:44:14 +01:00
clodanSPT a58065871f Removed ConcurrentDictionary in favor of locked dictionary, and added… (#287)
* Removed ConcurrentDictionary in favor of locked dictionary, and added reconnection behaviour to OnConnection

* Refactored code to handle multiple ws connected at the same time and offer graceful disconnection of appropriate sockets

* removed unused usings

---------

Co-authored-by: Alex <clodanSPT@hotmail.com>
Co-authored-by: Chomp <27521899+chompDev@users.noreply.github.com>
2025-05-28 11:42:56 +01:00
Chomp 1d85328586 Made locks readonly 2025-05-28 11:21:06 +01:00
Chomp 45bc4191dd Made use of Lock as.net 9 has optimisations for this object type 2025-05-28 11:18:50 +01:00
Chomp 8a382f5d63 Replaced concurrent dictionary with manual locks inside PMCLootGenerator 2025-05-28 11:06:16 +01:00
CWX cf15dc372b Fixed pinlockstate being wrong after restart 2025-05-28 10:27:12 +01:00
Chomp 158cf76dc8 Merge pull request #278 from CJ-SPT/collection-ittr-fix
Fix collection modification exception
2025-05-28 08:41:45 +01:00