Merge pull request #33 from SourceWriters/development

Lauriichan · web-flow · commit f2837076a41a · 2022-01-23T09:50:16.000+01:00
Fix DataProvider crashing plugins on Startup
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>net.sourcewriters.minecraft</groupId>
 	<artifactId>vcompat-parent</artifactId>
-	<version>3.0.0</version>
+	<version>3.0.1</version>
 	<packaging>pom</packaging>
 
 	<distributionManagement>
diff --git a/vcompat-1_17_R1/pom.xml b/vcompat-1_17_R1/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>net.sourcewriters.minecraft</groupId>
 		<artifactId>vcompat-parent</artifactId>
-		<version>3.0.0</version>
+		<version>3.0.1</version>
 	</parent>
 	<artifactId>vcompat-1_17_R1</artifactId>
 
@@ -19,7 +19,7 @@
 		<dependency>
 			<groupId>net.sourcewriters.minecraft</groupId>
 			<artifactId>vcompat-api</artifactId>
-			<version>3.0.0</version>
+            <version>${project.parent.version}</version>
 			<scope>provided</scope>
 		</dependency>
 
diff --git a/vcompat-1_18_R1/pom.xml b/vcompat-1_18_R1/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>net.sourcewriters.minecraft</groupId>
 		<artifactId>vcompat-parent</artifactId>
-		<version>3.0.0</version>
+		<version>3.0.1</version>
 	</parent>
 	<artifactId>vcompat-1_18_R1</artifactId>
 
@@ -27,7 +27,7 @@
 		<dependency>
 			<groupId>net.sourcewriters.minecraft</groupId>
 			<artifactId>vcompat-api</artifactId>
-			<version>3.0.0</version>
+			<version>${project.parent.version}</version>
 			<scope>provided</scope>
 		</dependency>
 
diff --git a/vcompat-api/pom.xml b/vcompat-api/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>net.sourcewriters.minecraft</groupId>
         <artifactId>vcompat-parent</artifactId>
-        <version>3.0.0</version>
+        <version>3.0.1</version>
     </parent>
     <artifactId>vcompat-api</artifactId>
 
diff --git a/vcompat-api/src/main/java/net/sourcewriters/minecraft/vcompat/provider/DataProvider.java b/vcompat-api/src/main/java/net/sourcewriters/minecraft/vcompat/provider/DataProvider.java
@@ -19,8 +19,7 @@ public class DataProvider extends VersionHandler<VersionControl> {
     public static final Supplier<UUID> DEFAULT_RANDOM = UUID::randomUUID;
 
     protected final NbtAdapterRegistry registry = new NbtAdapterRegistry();
-    protected final DataDistributor<UUID> defaultDistributor = createDistributor(
-        new File(Bukkit.getWorlds().get(0).getWorldFolder(), "pluginData"));
+    private DataDistributor<UUID> defaultDistributor;
 
     protected DataProvider(VersionControl versionControl) {
         super(versionControl);
@@ -35,10 +34,13 @@ public WrappedContainer createContainer() {
     }
 
     public WrappedContainer createPersistentContainer() {
-        return new SimpleSyntaxContainer<>(defaultDistributor.create());
+        return new SimpleSyntaxContainer<>(getDefaultDistributor().create());
     }
 
     public DataDistributor<UUID> getDefaultDistributor() {
+        if (defaultDistributor == null) {
+            return defaultDistributor = createDistributor(new File(Bukkit.getWorlds().get(0).getWorldFolder(), "pluginData"));
+        }
         return defaultDistributor;
     }
 
diff --git a/vcompat-core/pom.xml b/vcompat-core/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>net.sourcewriters.minecraft</groupId>
         <artifactId>vcompat-parent</artifactId>
-        <version>3.0.0</version>
+        <version>3.0.1</version>
     </parent>
     <artifactId>vcompat</artifactId>
 
@@ -14,25 +14,25 @@
         <dependency>
             <groupId>net.sourcewriters.minecraft</groupId>
             <artifactId>vcompat-api</artifactId>
-            <version>3.0.0</version>
+            <version>${project.parent.version}</version>
         </dependency>
 
         <!-- vCompat Versions -->
 
         <dependency>
             <groupId>net.sourcewriters.minecraft</groupId>
             <artifactId>vcompat-legacy</artifactId>
-            <version>3.0.0</version>
+            <version>${project.parent.version}</version>
         </dependency>
         <dependency>
             <groupId>net.sourcewriters.minecraft</groupId>
             <artifactId>vcompat-1_17_R1</artifactId>
-            <version>3.0.0</version>
+            <version>${project.parent.version}</version>
         </dependency>
         <dependency>
             <groupId>net.sourcewriters.minecraft</groupId>
             <artifactId>vcompat-1_18_R1</artifactId>
-            <version>3.0.0</version>
+            <version>${project.parent.version}</version>
         </dependency>
     </dependencies>
 
diff --git a/vcompat-legacy/pom.xml b/vcompat-legacy/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>net.sourcewriters.minecraft</groupId>
         <artifactId>vcompat-parent</artifactId>
-        <version>3.0.0</version>
+        <version>3.0.1</version>
     </parent>
     <artifactId>vcompat-legacy</artifactId>
 
@@ -15,7 +15,7 @@
         <dependency>
             <groupId>net.sourcewriters.minecraft</groupId>
             <artifactId>vcompat-api</artifactId>
-            <version>3.0.0</version>
+            <version>${project.parent.version}</version>
             <scope>provided</scope>
         </dependency>
 

Original file line number	Diff line number	Diff line change
`@@ -19,8 +19,7 @@ public class DataProvider extends VersionHandler<VersionControl> {`
`19`	`19`	`public static final Supplier<UUID> DEFAULT_RANDOM = UUID::randomUUID;`
`20`	`20`
`21`	`21`	`protected final NbtAdapterRegistry registry = new NbtAdapterRegistry();`
`22`		`- protected final DataDistributor<UUID> defaultDistributor = createDistributor(`
`23`		`- new File(Bukkit.getWorlds().get(0).getWorldFolder(), "pluginData"));`
	`22`	`+ private DataDistributor<UUID> defaultDistributor;`
`24`	`23`
`25`	`24`	`protected DataProvider(VersionControl versionControl) {`
`26`	`25`	`super(versionControl);`
`@@ -35,10 +34,13 @@ public WrappedContainer createContainer() {`
`35`	`34`	`}`
`36`	`35`
`37`	`36`	`public WrappedContainer createPersistentContainer() {`
`38`		`- return new SimpleSyntaxContainer<>(defaultDistributor.create());`
	`37`	`+ return new SimpleSyntaxContainer<>(getDefaultDistributor().create());`
`39`	`38`	`}`
`40`	`39`
`41`	`40`	`public DataDistributor<UUID> getDefaultDistributor() {`
	`41`	`+ if (defaultDistributor == null) {`
	`42`	`+ return defaultDistributor = createDistributor(new File(Bukkit.getWorlds().get(0).getWorldFolder(), "pluginData"));`
	`43`	`+ }`
`42`	`44`	`return defaultDistributor;`
`43`	`45`	`}`
`44`	`46`