diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntitySpawnScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntitySpawnScriptEvent.java
index a1427bee96..90fb14d566 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntitySpawnScriptEvent.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntitySpawnScriptEvent.java
@@ -38,7 +38,7 @@ public class EntitySpawnScriptEvent extends BukkitScriptEvent implements Listene
     // <context.entity> returns the EntityTag that spawned.
     // <context.location> returns the location the entity will spawn at.
     // <context.reason> returns the reason the entity spawned.
-    // Reasons: <@link url https://hub.spigotmc.org/javadocs/bukkit/org/bukkit/event/entity/CreatureSpawnEvent.SpawnReason.html>
+    // Reasons: <@link url https://hub.spigotmc.org/javadocs/spigot/org/bukkit/event/entity/CreatureSpawnEvent.SpawnReason.html>
     //
     // -->
 
diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityTransformScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityTransformScriptEvent.java
index 250a9c2ccc..becd5f2255 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityTransformScriptEvent.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityTransformScriptEvent.java
@@ -31,7 +31,7 @@ public class EntityTransformScriptEvent extends BukkitScriptEvent implements Lis
     // @Context
     // <context.entity> returns the old entity that was transformed from.
     // <context.new_entities> returns a list of new entities that were transformed into.
-    // <context.cause> returns the reason for transformation, from <@link url https://hub.spigotmc.org/javadocs/bukkit/org/bukkit/event/entity/EntityTransformEvent.TransformReason.html>.
+    // <context.cause> returns the reason for transformation, from <@link url https://hub.spigotmc.org/javadocs/spigot/org/bukkit/event/entity/EntityTransformEvent.TransformReason.html>.
     //
     // -->
 
diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerFishesScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerFishesScriptEvent.java
index 05dc738fbb..868c1dfe95 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerFishesScriptEvent.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerFishesScriptEvent.java
@@ -34,7 +34,7 @@ public class PlayerFishesScriptEvent extends BukkitScriptEvent implements Listen
     //
     // @Context
     // <context.hook> returns an EntityTag of the hook.
-    // <context.state> returns an ElementTag of the fishing state. Valid states: <@link url https://hub.spigotmc.org/javadocs/bukkit/org/bukkit/event/player/PlayerFishEvent.State.html>
+    // <context.state> returns an ElementTag of the fishing state. Valid states: <@link url https://hub.spigotmc.org/javadocs/spigot/org/bukkit/event/player/PlayerFishEvent.State.html>
     // <context.entity> returns an EntityTag of the entity that got caught.
     // <context.item> returns an ItemTag of the item gotten, if any.
     // <context.xp> returns the amount of experience that will drop.
diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerStatisticIncrementsScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerStatisticIncrementsScriptEvent.java
index 1463aa6c80..065b116a78 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerStatisticIncrementsScriptEvent.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerStatisticIncrementsScriptEvent.java
@@ -30,7 +30,7 @@ public class PlayerStatisticIncrementsScriptEvent extends BukkitScriptEvent impl
     // @Triggers when a player's statistics increment.
     //
     // @Context
-    // <context.statistic> returns the statistic that incremented. Statistic names: <@link url https://hub.spigotmc.org/javadocs/bukkit/org/bukkit/Statistic.html>
+    // <context.statistic> returns the statistic that incremented. Statistic names: <@link url https://hub.spigotmc.org/javadocs/spigot/org/bukkit/Statistic.html>
     // <context.previous_value> returns the old value of the statistic.
     // <context.new_value> returns the new value of the statistic.
     // <context.qualifier> returns the qualifier (EntityTag/MaterialTag) if any.
diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/ColorTag.java b/plugin/src/main/java/com/denizenscript/denizen/objects/ColorTag.java
index c7fb6b3bf7..a6823793c0 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/objects/ColorTag.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/objects/ColorTag.java
@@ -30,7 +30,7 @@ public class ColorTag implements ObjectTag {
     // For example, 'co@50,64,128' or 'co@red'.
     //
     // A list of accepted color names can be found at
-    // <@link url https://hub.spigotmc.org/javadocs/bukkit/org/bukkit/Color.html>
+    // <@link url https://hub.spigotmc.org/javadocs/spigot/org/bukkit/Color.html>
     //
     // Red/green/blue values are each from 0 to 255.
     //
diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/LocationTag.java b/plugin/src/main/java/com/denizenscript/denizen/objects/LocationTag.java
index c803331508..4b693b9961 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/objects/LocationTag.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/objects/LocationTag.java
@@ -1058,7 +1058,7 @@ public static void registerTags() {
         // @returns ElementTag
         // @description
         // Returns the base color of the banner at this location.
-        // For the list of possible colors, see <@link url https://hub.spigotmc.org/javadocs/bukkit/org/bukkit/DyeColor.html>.
+        // For the list of possible colors, see <@link url https://hub.spigotmc.org/javadocs/spigot/org/bukkit/DyeColor.html>.
         // As of 1.13+, this tag is no longer relevant.
         // -->
         registerTag("base_color", (attribute, object) -> {
@@ -1114,8 +1114,8 @@ public static void registerTags() {
         // @mechanism LocationTag.patterns
         // @description
         // Lists the patterns of the banner at this location in the form "COLOR/PATTERN|COLOR/PATTERN" etc.
-        // For the list of possible colors, see <@link url hhttps://hub.spigotmc.org/javadocs/bukkit/org/bukkit/DyeColor.html>.
-        // For the list of possible patterns, see <@link url https://hub.spigotmc.org/javadocs/bukkit/org/bukkit/block/banner/PatternType.html>.
+        // For the list of possible colors, see <@link url hhttps://hub.spigotmc.org/javadocs/spigot/org/bukkit/DyeColor.html>.
+        // For the list of possible patterns, see <@link url https://hub.spigotmc.org/javadocs/spigot/org/bukkit/block/banner/PatternType.html>.
         // -->
         registerTag("patterns", (attribute, object) -> {
             ListTag list = new ListTag();
@@ -3613,7 +3613,7 @@ else if (getBlock().getType() == Material.FLOWER_POT) {
         // @input Element
         // @description
         // Changes the base color of the banner at this location.
-        // For the list of possible colors, see <@link url https://hub.spigotmc.org/javadocs/bukkit/org/bukkit/DyeColor.html>.
+        // For the list of possible colors, see <@link url https://hub.spigotmc.org/javadocs/spigot/org/bukkit/DyeColor.html>.
         // As of 1.13+, this mechanism is no longer relevant.
         // @tags
         // <LocationTag.base_color>
@@ -3633,8 +3633,8 @@ else if (getBlock().getType() == Material.FLOWER_POT) {
         // @input ListTag
         // @description
         // Changes the patterns of the banner at this location. Input must be in the form "COLOR/PATTERN|COLOR/PATTERN" etc.
-        // For the list of possible colors, see <@link url https://hub.spigotmc.org/javadocs/bukkit/org/bukkit/DyeColor.html>.
-        // For the list of possible patterns, see <@link url https://hub.spigotmc.org/javadocs/bukkit/org/bukkit/block/banner/PatternType.html>.
+        // For the list of possible colors, see <@link url https://hub.spigotmc.org/javadocs/spigot/org/bukkit/DyeColor.html>.
+        // For the list of possible patterns, see <@link url https://hub.spigotmc.org/javadocs/spigot/org/bukkit/block/banner/PatternType.html>.
         // @tags
         // <LocationTag.patterns>
         // <server.pattern_types>
diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/PlayerTag.java b/plugin/src/main/java/com/denizenscript/denizen/objects/PlayerTag.java
index efed878137..7abfaefe1d 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/objects/PlayerTag.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/objects/PlayerTag.java
@@ -1460,7 +1460,7 @@ else if (Depends.permissions != null) {
         // @returns ElementTag(Number)
         // @description
         // Returns the player's current value for the specified statistic.
-        // Valid statistics: <@link url https://hub.spigotmc.org/javadocs/bukkit/org/bukkit/Statistic.html>
+        // Valid statistics: <@link url https://hub.spigotmc.org/javadocs/spigot/org/bukkit/Statistic.html>
         // Works with offline players.
         // -->
         registerTag("statistic", (attribute, object) -> {
@@ -1482,7 +1482,7 @@ else if (Depends.permissions != null) {
             // @description
             // Returns the player's current value for the specified statistic, with the
             // specified qualifier, which can be either an entity or material.
-            // Valid statistics: <@link url https://hub.spigotmc.org/javadocs/bukkit/org/bukkit/Statistic.html>
+            // Valid statistics: <@link url https://hub.spigotmc.org/javadocs/spigot/org/bukkit/Statistic.html>
             // To check a statistic type dynamically, refer to <@link tag server.statistic_type>.
             // -->
             if (attribute.startsWith("qualifier", 2)) {
@@ -3419,7 +3419,7 @@ else if (split.length > 1) {
         // @description
         // Shows the player fake patterns on a banner. Input must be in the form: "LOCATION|COLOR/PATTERN|..."
         // As of Minecraft 1.13, the base color is unique material types, and so <@link command showfake> must be used for base color changes.
-        // For the list of possible patterns, see <@link url https://hub.spigotmc.org/javadocs/bukkit/org/bukkit/block/banner/PatternType.html>.
+        // For the list of possible patterns, see <@link url https://hub.spigotmc.org/javadocs/spigot/org/bukkit/block/banner/PatternType.html>.
         // -->
         if (mechanism.matches("banner_update")) {
             if (mechanism.getValue().asString().length() > 0) {
diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/item/ItemBaseColor.java b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/item/ItemBaseColor.java
index ce9ca5f9c4..851f974f01 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/item/ItemBaseColor.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/item/ItemBaseColor.java
@@ -99,7 +99,7 @@ public ObjectTag getObjectAttribute(Attribute attribute) {
         // @mechanism ItemTag.base_color
         // @description
         // Gets the base color of a shield.
-        // For the list of possible colors, see <@link url https://hub.spigotmc.org/javadocs/bukkit/org/bukkit/DyeColor.html>.
+        // For the list of possible colors, see <@link url https://hub.spigotmc.org/javadocs/spigot/org/bukkit/DyeColor.html>.
         // -->
         if (attribute.startsWith("base_color")) {
             DyeColor baseColor = getBaseColor();
@@ -135,7 +135,7 @@ public void adjust(Mechanism mechanism) {
         // @input Element
         // @description
         // Changes the base color of a shield.
-        // For the list of possible colors, see <@link url https://hub.spigotmc.org/javadocs/bukkit/org/bukkit/DyeColor.html>.
+        // For the list of possible colors, see <@link url https://hub.spigotmc.org/javadocs/spigot/org/bukkit/DyeColor.html>.
         // @tags
         // <ItemTag.base_color>
         // -->
diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/item/ItemPatterns.java b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/item/ItemPatterns.java
index 4629a4caf2..a1c3e5bf9a 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/item/ItemPatterns.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/item/ItemPatterns.java
@@ -115,8 +115,8 @@ public ObjectTag getObjectAttribute(Attribute attribute) {
         // @mechanism ItemTag.patterns
         // @description
         // Lists a banner's patterns in the form "COLOR/PATTERN|COLOR/PATTERN" etc.
-        // For the list of possible colors, see <@link url https://hub.spigotmc.org/javadocs/bukkit/org/bukkit/DyeColor.html>.
-        // For the list of possible patterns, see <@link url https://hub.spigotmc.org/javadocs/bukkit/org/bukkit/block/banner/PatternType.html>.
+        // For the list of possible colors, see <@link url https://hub.spigotmc.org/javadocs/spigot/org/bukkit/DyeColor.html>.
+        // For the list of possible patterns, see <@link url https://hub.spigotmc.org/javadocs/spigot/org/bukkit/block/banner/PatternType.html>.
         // -->
         if (attribute.startsWith("patterns")) {
             return listPatterns().getObjectAttribute(attribute.fulfill(1));
@@ -149,8 +149,8 @@ public void adjust(Mechanism mechanism) {
         // @description
         // Changes the patterns of a banner. Input must be in the form
         // "COLOR/PATTERN|COLOR/PATTERN" etc.
-        // For the list of possible colors, see <@link url https://hub.spigotmc.org/javadocs/bukkit/org/bukkit/DyeColor.html>.
-        // For the list of possible patterns, see <@link url https://hub.spigotmc.org/javadocs/bukkit/org/bukkit/block/banner/PatternType.html>.
+        // For the list of possible colors, see <@link url https://hub.spigotmc.org/javadocs/spigot/org/bukkit/DyeColor.html>.
+        // For the list of possible patterns, see <@link url https://hub.spigotmc.org/javadocs/spigot/org/bukkit/block/banner/PatternType.html>.
         // @tags
         // <ItemTag.patterns>
         // <server.pattern_types>
diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/player/StatisticCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/player/StatisticCommand.java
index fe02ac900b..64739f8f34 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/player/StatisticCommand.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/player/StatisticCommand.java
@@ -35,7 +35,7 @@ public StatisticCommand() {
     // @Description
     // Changes the specified statistic for the player.
     // For more info on statistics, see <@link url https://minecraft.gamepedia.com/Statistics>
-    // For statistic names, see <@link url https://hub.spigotmc.org/javadocs/bukkit/org/bukkit/Statistic.html>
+    // For statistic names, see <@link url https://hub.spigotmc.org/javadocs/spigot/org/bukkit/Statistic.html>
     //
     // You can add, take, or set a numeric value to the statistic for the linked player.
     // Works with offline players.
diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/PlaySoundCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/PlaySoundCommand.java
index d4426eae87..24f0cb99bb 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/PlaySoundCommand.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/PlaySoundCommand.java
@@ -40,7 +40,7 @@ public PlaySoundCommand() {
     //
     // Sounds are by default played under their normal sound type (eg zombie sounds are under the type Mobs/Animals).
     // You can optionally instead specify an alternate sound category to use.
-    // For a list of all valid sound categories, check <@link url https://hub.spigotmc.org/javadocs/bukkit/org/bukkit/SoundCategory.html>
+    // For a list of all valid sound categories, check <@link url https://hub.spigotmc.org/javadocs/spigot/org/bukkit/SoundCategory.html>
     //
     // Specifying a player or list of players will only play the sound for each player, from their own location (but will not follow them if they move).
     // If a location is specified, it will play the sound for any players that are near the location specified.
diff --git a/plugin/src/main/java/com/denizenscript/denizen/tags/core/ServerTagBase.java b/plugin/src/main/java/com/denizenscript/denizen/tags/core/ServerTagBase.java
index 5f7c1c3a88..737a198ff8 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/tags/core/ServerTagBase.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/tags/core/ServerTagBase.java
@@ -889,7 +889,7 @@ else if (recipe instanceof CookingRecipe<?>) {
         // @description
         // Returns a list of all statistic types known to the server.
         // Generally used with <@link tag PlayerTag.statistic>.
-        // This is only their Bukkit enum names, as seen at <@link url https://hub.spigotmc.org/javadocs/bukkit/org/bukkit/Statistic.html>.
+        // This is only their Bukkit enum names, as seen at <@link url https://hub.spigotmc.org/javadocs/spigot/org/bukkit/Statistic.html>.
         // Optionally, specify a type to limit to statistics of a given type. Valid types: UNTYPED, ITEM, ENTITY, or BLOCK.
         // Refer also to <@link tag server.statistic_type>.
         // -->