Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

2.6.2 - Fix JsonShopConfiguration saves #157

Open
wants to merge 42 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
af66aff
Add 'radius' as alias for 'distance' in /ts find
SparklingComet Oct 8, 2023
e6e4268
Version change to 2.6.2-DEV
SparklingComet Oct 8, 2023
c773a35
Make shop saving sync again
SparklingComet Oct 8, 2023
cfbcc92
Implement thread pool for JsonShopConfiguration saves
SparklingComet Oct 8, 2023
5ee50f1
Improve saving logic for maxThreads == 0 and filesBeingSaved
SparklingComet Oct 9, 2023
68293ed
Fix sync (maxThreads=0) saving
SparklingComet Oct 9, 2023
2d04772
Fix early loop end
SparklingComet Oct 9, 2023
558d0de
Remove unnecessary verification debug
SparklingComet Oct 9, 2023
306a0be
Work on concurrency issues
SparklingComet Oct 9, 2023
55b1540
Add comment about max-save-threads
SparklingComet Oct 11, 2023
f613e82
Switch from SaveTasks having their own private files and queues to mo…
SparklingComet Oct 11, 2023
bb0e518
Add synchronized(file) lock
SparklingComet Oct 12, 2023
d7c6576
Cache File objects for synchronied(File) lock
SparklingComet Oct 12, 2023
6371430
Reduce some excessive saving
SparklingComet Oct 13, 2023
e2d0a16
Rename Json...Configuration to Json...Data and add JsonShopData cache
SparklingComet Oct 13, 2023
9898123
Add build number from Jenkins to startup splash message
SparklingComet Oct 14, 2023
a5e114d
"Fix" for excess '}' in Shop save files.
KillerOfPie Oct 19, 2023
b927bc6
Fix for .json.bak files being included when counting shops in world.
KillerOfPie Oct 20, 2023
86f6745
Pick changes from 2.6.2-Debug
KillerOfPie Oct 30, 2023
34cc5d4
Replacing Gson Implementation to fix saving bugs
KillerOfPie Nov 5, 2023
991857f
Fix String errors from previous build
KillerOfPie Nov 10, 2023
a687c38
Fix NPE error when chest_linkage has no content
KillerOfPie Nov 12, 2023
dce1c96
Fix NPE error when loading data from a null shopLocation
KillerOfPie Nov 16, 2023
a4114a3
Fix NPE error on PlayerJoinEvent due to non-existent player data
KillerOfPie Nov 16, 2023
058f649
Fix UOE when reading old shop data
KillerOfPie Nov 16, 2023
4474ce3
Fix for reading shop data
KillerOfPie Nov 23, 2023
85c02aa
Fix for NPE while reading shop data
KillerOfPie Nov 23, 2023
8d0fa4f
Fix for errors reading shop and player files
KillerOfPie Nov 23, 2023
727d7af
Fix for errors reading shop and player files
KillerOfPie Nov 24, 2023
3d72c5c
Fix for errors saving shop data
KillerOfPie Nov 25, 2023
b494deb
Rewrite ShopChunk Loading to avoid jsonObj
KillerOfPie Nov 25, 2023
efe0067
Rewrite ShopChunk Loading to avoid jsonObj
KillerOfPie Nov 26, 2023
1ebb5d1
2.6.2 PTSD bug fix bandaging
KillerOfPie Dec 30, 2023
1eb53bd
Merge branch '2.6.2' into detached
KillerOfPie Dec 30, 2023
a07a1fd
2.6.2 PTSD bug fix bandaging
KillerOfPie Dec 30, 2023
0d3f736
PTSD Merger Fixes
KillerOfPie Dec 30, 2023
10ad85f
Fix for Creation values being deleted instead of ignored.
KillerOfPie Dec 30, 2023
54a7f3b
Fix for Shops not loading from file
KillerOfPie Dec 31, 2023
538712e
Potential fix for missing Items after server restart
KillerOfPie Dec 31, 2023
fb45e68
Exception fixes
KillerOfPie Jan 1, 2024
4fce958
Config Comments/FileCaching
KillerOfPie Jan 2, 2024
89f300f
Fixed Shop creation Error
KillerOfPie Jan 18, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix early loop end
  • Loading branch information
SparklingComet committed Oct 9, 2023
commit 2d0477201a057673c55d69f0b606cfd107539a41
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ public void run() {

if (str.isEmpty() || jsonObj.entrySet().isEmpty()) {
file.delete();
return;
continue;
}

try {
Expand Down