Provide default list if auction data is not available + Generations f…

…ixes
NickImpact · Mar 10, 2021 · d36f0dc · d36f0dc
1 parent 437a282
commit d36f0dc
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 5 deletions.
diff --git a/changelogs/6.1.2.md b/changelogs/6.1.2.md
@@ -0,0 +1,2 @@
+# Fixes
+* Fixed language files being in the wrong location
diff --git a/changelogs/6.1.3.md b/changelogs/6.1.3.md
@@ -0,0 +1,6 @@
+# Fixes
+* Fix an issue with 6.0.x databases with the recent auction fixes
+
+# Extensions
+* Generations: Register the legacy deserializer
+* Generations: Enforce main thread for purchase processing due to required entity creation
diff --git a/.../src/main/java/net/impactdev/gts/common/storage/implementation/sql/SqlImplementation.java b/.../src/main/java/net/impactdev/gts/common/storage/implementation/sql/SqlImplementation.java
@@ -375,11 +375,12 @@ public Stash getStash(UUID user) throws Exception {
 							ps.setString(1, auction.getID().toString());
 							return this.results(ps, results -> {
 								if(results.next()) {
-									List<UUID> others = GTSPlugin.getInstance().getGson()
-											.fromJson(results.getString("others"), new TypeToken<List<UUID>>() {
-											}.getType());
+									List<UUID> others = GTSPlugin.getInstance().getGson().fromJson(
+											results.getString("others"),
+											new TypeToken<List<UUID>>() {}.getType()
+									);
 
-									return others.contains(user);
+									return Optional.ofNullable(others).orElse(Lists.newArrayList()).contains(user);
 								}
 
 								return false;

diff --git a/pixelmon b/pixelmon
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		# Fixes
		* Fixed language files being in the wrong location
+2 −0		generations/sponge/src/main/java/net/impactdev/gts/generations/sponge/GTSSpongeGenerationsPlugin.java
+64 −0		generations/sponge/src/main/java/net/impactdev/gts/generations/sponge/legacy/GsonUtils.java
+10 −1		.../sponge/src/main/java/net/impactdev/gts/generations/sponge/legacy/LegacyGenerationsPokemonDeserializer.java