--- a/net/minecraft/server/commands/WorldBorderCommand.java
+++ b/net/minecraft/server/commands/WorldBorderCommand.java
@@ -136,7 +_,7 @@
     }
 
     private static int setDamageBuffer(CommandSourceStack source, float distance) throws CommandSyntaxException {
-        WorldBorder worldBorder = source.getServer().overworld().getWorldBorder();
+        WorldBorder worldBorder = source.getLevel().getWorldBorder(); // CraftBukkit
         if (worldBorder.getDamageSafeZone() == distance) {
             throw ERROR_SAME_DAMAGE_BUFFER.create();
         } else {
@@ -147,7 +_,7 @@
     }
 
     private static int setDamageAmount(CommandSourceStack source, float damagePerBlock) throws CommandSyntaxException {
-        WorldBorder worldBorder = source.getServer().overworld().getWorldBorder();
+        WorldBorder worldBorder = source.getLevel().getWorldBorder(); // CraftBukkit
         if (worldBorder.getDamagePerBlock() == damagePerBlock) {
             throw ERROR_SAME_DAMAGE_AMOUNT.create();
         } else {
@@ -160,7 +_,7 @@
     }
 
     private static int setWarningTime(CommandSourceStack source, int time) throws CommandSyntaxException {
-        WorldBorder worldBorder = source.getServer().overworld().getWorldBorder();
+        WorldBorder worldBorder = source.getLevel().getWorldBorder(); // CraftBukkit
         if (worldBorder.getWarningTime() == time) {
             throw ERROR_SAME_WARNING_TIME.create();
         } else {
@@ -171,7 +_,7 @@
     }
 
     private static int setWarningDistance(CommandSourceStack source, int distance) throws CommandSyntaxException {
-        WorldBorder worldBorder = source.getServer().overworld().getWorldBorder();
+        WorldBorder worldBorder = source.getLevel().getWorldBorder(); // CraftBukkit
         if (worldBorder.getWarningBlocks() == distance) {
             throw ERROR_SAME_WARNING_DISTANCE.create();
         } else {
@@ -182,13 +_,13 @@
     }
 
     private static int getSize(CommandSourceStack source) {
-        double size = source.getServer().overworld().getWorldBorder().getSize();
+        double size = source.getLevel().getWorldBorder().getSize(); // CraftBukkit
         source.sendSuccess(() -> Component.translatable("commands.worldborder.get", String.format(Locale.ROOT, "%.0f", size)), false);
         return Mth.floor(size + 0.5);
     }
 
     private static int setCenter(CommandSourceStack source, Vec2 pos) throws CommandSyntaxException {
-        WorldBorder worldBorder = source.getServer().overworld().getWorldBorder();
+        WorldBorder worldBorder = source.getLevel().getWorldBorder(); // CraftBukkit
         if (worldBorder.getCenterX() == pos.x && worldBorder.getCenterZ() == pos.y) {
             throw ERROR_SAME_CENTER.create();
         } else if (!(Math.abs(pos.x) > 2.9999984E7) && !(Math.abs(pos.y) > 2.9999984E7)) {
@@ -206,7 +_,7 @@
     }
 
     private static int setSize(CommandSourceStack source, double newSize, long time) throws CommandSyntaxException {
-        WorldBorder worldBorder = source.getServer().overworld().getWorldBorder();
+        WorldBorder worldBorder = source.getLevel().getWorldBorder(); // CraftBukkit
         double size = worldBorder.getSize();
         if (size == newSize) {
             throw ERROR_SAME_SIZE.create();
