Skip to content

Commit 27b34f6

Browse files
committed
debugblock: minimal compatibility, meta note
1 parent 5cdacb8 commit 27b34f6

2 files changed

Lines changed: 11 additions & 3 deletions

File tree

plugin/src/main/java/com/denizenscript/denizen/scripts/commands/player/DebugBlockCommand.java

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@
55
import com.denizenscript.denizen.objects.PlayerTag;
66
import com.denizenscript.denizen.utilities.BukkitImplDeprecations;
77
import com.denizenscript.denizen.utilities.Utilities;
8-
import com.denizenscript.denizencore.objects.core.ColorTag;
9-
import com.denizenscript.denizencore.utilities.debugging.Debug;
108
import com.denizenscript.denizencore.exceptions.InvalidArgumentsException;
119
import com.denizenscript.denizencore.objects.Argument;
10+
import com.denizenscript.denizencore.objects.core.ColorTag;
1211
import com.denizenscript.denizencore.objects.core.DurationTag;
1312
import com.denizenscript.denizencore.objects.core.ElementTag;
1413
import com.denizenscript.denizencore.objects.core.ListTag;
1514
import com.denizenscript.denizencore.scripts.ScriptEntry;
1615
import com.denizenscript.denizencore.scripts.commands.AbstractCommand;
16+
import com.denizenscript.denizencore.utilities.debugging.Debug;
1717

1818
import java.util.Collections;
1919
import java.util.List;
@@ -43,6 +43,12 @@ public DebugBlockCommand() {
4343
//
4444
// If arguments are unspecified, the default color is white, the default player is the linked player, the default name is none, and the default duration is 10 seconds.
4545
//
46+
// Note that on MC 1.21+ this has limitations (within Minecraft itself), namely:
47+
// - the color is always green.
48+
// - the duration is always 10 seconds.
49+
// - the name can only be a LocationTag and defaults to the debug block's location if unspecified.
50+
// - debug blocks can't be cleared.
51+
//
4652
// @Tags
4753
// None
4854
//

v1_21/src/main/java/com/denizenscript/denizen/nms/v1_21/helpers/PacketHelperImpl.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
import com.denizenscript.denizen.utilities.maps.MapImage;
1414
import com.denizenscript.denizen.utilities.packets.NetworkInterceptHelper;
1515
import com.denizenscript.denizencore.objects.core.ColorTag;
16+
import com.denizenscript.denizencore.utilities.CoreUtilities;
1617
import com.denizenscript.denizencore.utilities.ReflectionHelper;
1718
import com.denizenscript.denizencore.utilities.debugging.Debug;
1819
import net.md_5.bungee.api.ChatColor;
@@ -353,7 +354,8 @@ public void enableNetworkManager() {
353354
@Override
354355
public void showDebugTestMarker(Player player, Location location, ColorTag color, String name, int time) {
355356
BlockPos nmsPos = CraftLocation.toBlockPosition(location);
356-
send(player, new ClientboundGameTestHighlightPosPacket(nmsPos, nmsPos));
357+
LocationTag displayPos = !name.isEmpty() ? LocationTag.valueOf(name, CoreUtilities.noDebugContext) : null;
358+
send(player, new ClientboundGameTestHighlightPosPacket(nmsPos, displayPos != null ? CraftLocation.toBlockPosition(displayPos) : nmsPos));
357359
}
358360

359361
@Override

0 commit comments

Comments
 (0)