diff --git a/pom.xml b/pom.xml
index dd10ea68f..5f1bee794 100644
--- a/pom.xml
+++ b/pom.xml
@@ -327,7 +327,7 @@
                     <dependency>
                         <groupId>org.eclipse.jdt</groupId>
                         <artifactId>ecj</artifactId>
-                        <version>3.24.0</version>
+                        <version>3.26.0</version>
                     </dependency>
                 </dependencies>
             </plugin>
@@ -363,7 +363,7 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-checkstyle-plugin</artifactId>
-                        <version>3.1.1</version>
+                        <version>3.1.2</version>
                         <executions>
                             <execution>
                                 <phase>process-classes</phase>
@@ -380,7 +380,7 @@
                             <dependency>
                                 <groupId>com.puppycrawl.tools</groupId>
                                 <artifactId>checkstyle</artifactId>
-                                <version>8.39</version>
+                                <version>8.44</version>
                             </dependency>
                         </dependencies>
                     </plugin>
diff --git a/src/main/java/org/bukkit/craftbukkit/metadata/BlockMetadataStore.java b/src/main/java/org/bukkit/craftbukkit/metadata/BlockMetadataStore.java
index b3659e4c1..93681b52d 100644
--- a/src/main/java/org/bukkit/craftbukkit/metadata/BlockMetadataStore.java
+++ b/src/main/java/org/bukkit/craftbukkit/metadata/BlockMetadataStore.java
@@ -25,10 +25,10 @@ public class BlockMetadataStore extends MetadataStoreBase<Block> implements Meta
 
     /**
      * Generates a unique metadata key for a {@link Block} object based on its coordinates in the world.
-     * @see MetadataStoreBase#disambiguate(Object, String)
      * @param block the block
      * @param metadataKey The name identifying the metadata value
      * @return a unique metadata key
+     * @see MetadataStoreBase#disambiguate(Object, String)
      */
     @Override
     protected String disambiguate(Block block, String metadataKey) {
diff --git a/src/main/java/org/bukkit/craftbukkit/metadata/EntityMetadataStore.java b/src/main/java/org/bukkit/craftbukkit/metadata/EntityMetadataStore.java
index 35c484f46..f475ade1b 100644
--- a/src/main/java/org/bukkit/craftbukkit/metadata/EntityMetadataStore.java
+++ b/src/main/java/org/bukkit/craftbukkit/metadata/EntityMetadataStore.java
@@ -11,10 +11,10 @@ public class EntityMetadataStore extends MetadataStoreBase<Entity> implements Me
     /**
      * Generates a unique metadata key for an {@link Entity} UUID.
      *
-     * @see MetadataStoreBase#disambiguate(Object, String)
      * @param entity the entity
      * @param metadataKey The name identifying the metadata value
      * @return a unique metadata key
+     * @see MetadataStoreBase#disambiguate(Object, String)
      */
     @Override
     protected String disambiguate(Entity entity, String metadataKey) {
diff --git a/src/main/java/org/bukkit/craftbukkit/metadata/PlayerMetadataStore.java b/src/main/java/org/bukkit/craftbukkit/metadata/PlayerMetadataStore.java
index bac5c9e43..554e81bab 100644
--- a/src/main/java/org/bukkit/craftbukkit/metadata/PlayerMetadataStore.java
+++ b/src/main/java/org/bukkit/craftbukkit/metadata/PlayerMetadataStore.java
@@ -11,10 +11,10 @@ public class PlayerMetadataStore extends MetadataStoreBase<OfflinePlayer> implem
     /**
      * Generates a unique metadata key for {@link org.bukkit.entity.Player} and {@link OfflinePlayer} using the player
      * UUID.
-     * @see MetadataStoreBase#disambiguate(Object, String)
      * @param player the player
      * @param metadataKey The name identifying the metadata value
      * @return a unique metadata key
+     * @see MetadataStoreBase#disambiguate(Object, String)
      */
     @Override
     protected String disambiguate(OfflinePlayer player, String metadataKey) {
diff --git a/src/main/java/org/bukkit/craftbukkit/metadata/WorldMetadataStore.java b/src/main/java/org/bukkit/craftbukkit/metadata/WorldMetadataStore.java
index dd37ed294..02996286a 100644
--- a/src/main/java/org/bukkit/craftbukkit/metadata/WorldMetadataStore.java
+++ b/src/main/java/org/bukkit/craftbukkit/metadata/WorldMetadataStore.java
@@ -10,10 +10,10 @@ import org.bukkit.metadata.MetadataStoreBase;
 public class WorldMetadataStore extends MetadataStoreBase<World> implements MetadataStore<World> {
     /**
      * Generates a unique metadata key for a {@link World} object based on the world UID.
-     * @see WorldMetadataStore#disambiguate(Object, String)
      * @param world the world
      * @param metadataKey The name identifying the metadata value
      * @return a unique metadata key
+     * @see WorldMetadataStore#disambiguate(Object, String)
      */
     @Override
     protected String disambiguate(World world, String metadataKey) {