Merge pull request #6 from BONNePlayground/develop

Update to Minecraft 1.18.2 version.
BONNePlayground · Mar 7, 2022 · 49c2442 · 49c2442
2 parents 504f264 + b7c8fca
commit 49c2442
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 10 deletions.
diff --git a/pom.xml b/pom.xml
@@ -20,13 +20,13 @@
 		<java.version>17</java.version>
 		<powermock.version>1.7.4</powermock.version>
 		<!-- More visible way how to change dependency versions -->
-		<spigot.version>1.18-R0.1-SNAPSHOT</spigot.version>
-		<bentobox.version>1.17.3</bentobox.version>
+		<spigot.version>1.18.2-R0.1-SNAPSHOT</spigot.version>
+		<bentobox.version>1.20.0</bentobox.version>
 		<level.version>2.5.0</level.version>
 		<!-- Revision variable removes warning about dynamic version -->
 		<revision>${build.version}-SNAPSHOT</revision>
 		<!-- This allows to change between versions and snapshots. -->
-		<build.version>1.4.0</build.version>
+		<build.version>1.4.1</build.version>
 		<build.number>-LOCAL</build.number>
 	</properties>
 
@@ -172,13 +172,19 @@
 		<dependency>
 			<groupId>io.github.iltotore</groupId>
 			<artifactId>customentity</artifactId>
-			<version>1.3.0</version>
+			<version>1.3.1</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>lv.id.bonne</groupId>
 			<artifactId>dragonfights-v1_18_r1</artifactId>
-			<version>1.3.0</version>
+			<version>1.3.1</version>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>lv.id.bonne</groupId>
+			<artifactId>dragonfights-v1_18_r2</artifactId>
+			<version>1.3.1</version>
 			<scope>compile</scope>
 		</dependency>
 	</dependencies>

diff --git a/src/main/java/lv/id/bonne/dragonfights/DragonFightsAddon.java b/src/main/java/lv/id/bonne/dragonfights/DragonFightsAddon.java
@@ -103,9 +103,12 @@ public void onEnable()
 	public void allLoaded()
 	{
 		super.allLoaded();
-		this.addonManager.load();
-	}
 
+		if (this.getState() == State.ENABLED)
+		{
+			this.addonManager.load();
+		}
+	}
 
 	/**
 	 * This method hooks addon into GameMode.

diff --git a/src/main/java/lv/id/bonne/dragonfights/DragonFightsPladdon.java b/src/main/java/lv/id/bonne/dragonfights/DragonFightsPladdon.java
@@ -19,7 +19,7 @@
  * @author tastybento
  */
 @Plugin(name="Pladdon", version="1.0")
-@ApiVersion(ApiVersion.Target.v1_17)
+@ApiVersion(ApiVersion.Target.v1_18)
 @Dependency(value = "BentoBox")
 public class DragonFightsPladdon extends Pladdon
 {

diff --git a/src/main/java/lv/id/bonne/dragonfights/entity/BentoBoxEnderDragonRoot.java b/src/main/java/lv/id/bonne/dragonfights/entity/BentoBoxEnderDragonRoot.java
@@ -89,7 +89,8 @@ public Collection<BiomeSpawn> getSpawns(ServerVersion version)
 	 * Populate entities based on server version.
 	 */
 	{
-		this.setVersion(ServerVersion.v1_18, lv.id.bonne.dragonfights.v1_18_R1.entity.BentoBoxEnderDragonType::new);
+		this.setVersion(ServerVersion.v1_18_1, lv.id.bonne.dragonfights.v1_18_R1.entity.BentoBoxEnderDragonType::new);
+		this.setVersion(ServerVersion.v1_18_2, lv.id.bonne.dragonfights.v1_18_R2.entity.BentoBoxEnderDragonType::new);
 	}
 }
 
diff --git a/src/main/java/lv/id/bonne/dragonfights/entity/CustomEntityAPI.java b/src/main/java/lv/id/bonne/dragonfights/entity/CustomEntityAPI.java
@@ -53,6 +53,7 @@ public static NMSHandler getAPI()
 	 */
 	static
 	{
-		versions.put(ServerVersion.v1_18, lv.id.bonne.dragonfights.v1_18_R1.NMSHandler::new);
+		versions.put(ServerVersion.v1_18_1, lv.id.bonne.dragonfights.v1_18_R1.NMSHandler::new);
+		versions.put(ServerVersion.v1_18_2, lv.id.bonne.dragonfights.v1_18_R2.NMSHandler::new);
 	}
 }