Fix NPE in ShopLoader

Ghost-chu · Ghost-chu · commit f1e5bf4bcef2 · 2021-10-02T17:19:49.000+08:00
diff --git a/src/main/java/org/maxgamer/quickshop/shop/ShopLoader.java b/src/main/java/org/maxgamer/quickshop/shop/ShopLoader.java
@@ -493,7 +493,7 @@ public class ShopDatabaseInfo {
                 this.extra = deserializeExtra(origin.getExtra(), needUpdate);
                 this.currency = origin.getCurrency();
                 this.disableDisplay = origin.isDisableDisplay();
-                this.taxAccount = UUID.fromString(origin.getTaxAccount());
+                this.taxAccount = origin.getTaxAccount() != null ? UUID.fromString(origin.getTaxAccount()) : null;
             } catch (Exception ex) {
                 exceptionHandler(ex, this.location);
             }

Original file line number	Diff line number	Diff line change
`@@ -493,7 +493,7 @@ public class ShopDatabaseInfo {`
`493`	`493`	`this.extra = deserializeExtra(origin.getExtra(), needUpdate);`
`494`	`494`	`this.currency = origin.getCurrency();`
`495`	`495`	`this.disableDisplay = origin.isDisableDisplay();`
`496`		`- this.taxAccount = UUID.fromString(origin.getTaxAccount());`
	`496`	`+ this.taxAccount = origin.getTaxAccount() != null ? UUID.fromString(origin.getTaxAccount()) : null;`
`497`	`497`	`} catch (Exception ex) {`
`498`	`498`	`exceptionHandler(ex, this.location);`
`499`	`499`	`}`