Update to 1.21

CitizensDev · Jun 14, 2024 · 9a0bdd0 · 9a0bdd0
1 parent 8661ba6
commit 9a0bdd0
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 24 deletions.
diff --git a/pom.xml b/pom.xml
@@ -4,11 +4,11 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>net.citizensnpcs</groupId>
     <artifactId>citizensapi</artifactId>
-    <version>2.0.34-SNAPSHOT</version>
+    <version>2.0.35-SNAPSHOT</version>
     <name>CitizensAPI</name>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <bukkit.version>1.20.6-R0.1-SNAPSHOT</bukkit.version>
+        <bukkit.version>1.21-R0.1-SNAPSHOT</bukkit.version>
         <placeholderapi.version>2.11.5</placeholderapi.version>
         <worldguard.version>7.0.4</worldguard.version>
         <build.number>Unknown</build.number>
@@ -30,10 +30,6 @@
                 <enabled>false</enabled>
             </snapshots>
         </repository>
-        <repository>
-            <id>sonatype-oss-snapshots1</id>
-            <url>https://s01.oss.sonatype.org/content/repositories/snapshots/</url>
-        </repository>
     </repositories>
     <dependencies>
         <dependency>
@@ -75,7 +71,7 @@
         <dependency>
             <groupId>net.kyori</groupId>
             <artifactId>adventure-platform-bukkit</artifactId>
-            <version>4.3.3-SNAPSHOT</version>
+            <version>4.3.3</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>

diff --git a/src/main/java/net/citizensnpcs/api/event/NPCCombustEvent.java b/src/main/java/net/citizensnpcs/api/event/NPCCombustEvent.java
@@ -15,11 +15,8 @@ public NPCCombustEvent(EntityCombustEvent event, NPC npc) {
         this.event = event;
     }
 
-    /**
-     * @return the amount of time (in seconds) the combustee should be alight for
-     */
-    public int getDuration() {
-        return event.getDuration();
+    public EntityCombustEvent getHandle() {
+        return event;
     }
 
     @Override
@@ -37,18 +34,6 @@ public void setCancelled(boolean cancelled) {
         this.cancelled = cancelled;
     }
 
-    /**
-     * The number of seconds the combustee should be alight for.
-     * <p />
-     * This value will only ever increase the combustion time, not decrease existing combustion times.
-     *
-     * @param duration
-     *            the time in seconds to be alight for.
-     */
-    public void setDuration(int duration) {
-        event.setDuration(duration);
-    }
-
     public static HandlerList getHandlerList() {
         return handlers;
     }

diff --git a/src/main/java/net/citizensnpcs/api/util/SpigotUtil.java b/src/main/java/net/citizensnpcs/api/util/SpigotUtil.java
@@ -74,6 +74,9 @@ public static int[] getVersion() {
             if (parts[1].contains("-")) {
                 parts[1] = parts[1].split("-")[0];
             }
+            if (parts[2].contains("-")) {
+                parts[2] = parts[2].split("-")[0];
+            }
             if (parts.length == 3) {
                 return BUKKIT_VERSION = new int[] { Integer.parseInt(parts[0]), Integer.parseInt(parts[1]),
                         Integer.parseInt(parts[2]) };