From ad8bc658bb22ea40083783d9fbd794f82f16be88 Mon Sep 17 00:00:00 2001
From: Martijn van den Brand <MartijnvandenBrand@outlook.com>
Date: Wed, 23 Mar 2022 00:58:35 +0000
Subject: [PATCH] Account for `/forge setdimension` command arguments (#7971)

Use the `/forge setdimension` command 'targets' argument and provide a default for the 'pos' argument as it's optional
---
 .../server/command/CommandSetDimension.java           | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/main/java/net/minecraftforge/server/command/CommandSetDimension.java b/src/main/java/net/minecraftforge/server/command/CommandSetDimension.java
index 258ea8a473..ba1460d5d6 100644
--- a/src/main/java/net/minecraftforge/server/command/CommandSetDimension.java
+++ b/src/main/java/net/minecraftforge/server/command/CommandSetDimension.java
@@ -70,27 +70,26 @@ public class CommandSetDimension
             throw NO_ENTITIES.create();
 
         String cmdTarget = "@s";
-        String posTarget = "";
+        String posTarget = "~ ~ ~";
         for (ParsedCommandNode<CommandSource> parsed : ctx.getNodes())
         {
-            final CommandNode<CommandSource> node = parsed.getNode();
             if (parsed.getNode() instanceof ArgumentCommandNode)
             {
-                if ("target".equals(parsed.getNode().getName()))
+                if ("targets".equals(parsed.getNode().getName()))
                 {
                     cmdTarget = parsed.getRange().get(ctx.getInput());
                 }
                 else if ("pos".equals(parsed.getNode().getName()))
                 {
-                    posTarget = " " + parsed.getRange().get(ctx.getInput());
+                    posTarget = parsed.getRange().get(ctx.getInput());
                 }
             }
         }
         final String dimName = dim.dimension().location().toString();
         final String finalCmdTarget = cmdTarget;
         final String finalPosTarget = posTarget;
-        ITextComponent suggestion = new TranslationTextComponent("/execute in %s run tp %s%s", dimName, cmdTarget, finalPosTarget)
-                .withStyle((style) -> style.withColor(TextFormatting.GREEN).withClickEvent(new ClickEvent(ClickEvent.Action.SUGGEST_COMMAND, "/execute in " + dimName + " run tp " + finalCmdTarget + finalPosTarget)));
+        ITextComponent suggestion = new TranslationTextComponent("/execute in %s run tp %s %s", dimName, cmdTarget, finalPosTarget)
+                .withStyle((style) -> style.withColor(TextFormatting.GREEN).withClickEvent(new ClickEvent(ClickEvent.Action.SUGGEST_COMMAND, "/execute in " + dimName + " run tp " + finalCmdTarget + " " + finalPosTarget)));
         ctx.getSource().sendSuccess(new TranslationTextComponent("commands.forge.setdim.deprecated", suggestion), true);
 
         return 0;