From 15a3eac661fc6091089026120e978a90c68b318e Mon Sep 17 00:00:00 2001 From: md_5 Date: Tue, 11 Apr 2023 18:52:28 +1000 Subject: [PATCH] SPIGOT-7335: Fix typo in TextDisplay#TextAlignment enum name --- .../craftbukkit/entity/CraftTextDisplay.java | 6 ++--- .../bukkit/craftbukkit/util/Commodore.java | 23 +++++++++++++++++++ 2 files changed, 26 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftTextDisplay.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftTextDisplay.java index 1dfe22b11..1198aff6b 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftTextDisplay.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftTextDisplay.java @@ -106,13 +106,13 @@ public class CraftTextDisplay extends CraftDisplay implements TextDisplay { } @Override - public TextAligment getAlignment() { + public TextAlignment getAlignment() { Display.TextDisplay.Align nms = Display.TextDisplay.getAlign(getHandle().getFlags()); - return TextAligment.valueOf(nms.name()); + return TextAlignment.valueOf(nms.name()); } @Override - public void setAlignment(TextAligment alignment) { + public void setAlignment(TextAlignment alignment) { Preconditions.checkArgument(alignment != null, "Alignment cannot be null"); switch (alignment) { diff --git a/src/main/java/org/bukkit/craftbukkit/util/Commodore.java b/src/main/java/org/bukkit/craftbukkit/util/Commodore.java index 03a3e4c3e..41c6ad400 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/Commodore.java +++ b/src/main/java/org/bukkit/craftbukkit/util/Commodore.java @@ -202,6 +202,13 @@ public class Commodore } } + // SPIGOT-7335 + if ( owner.equals( "org/bukkit/entity/TextDisplay$TextAligment" ) ) + { + super.visitFieldInsn( opcode, "org/bukkit/entity/TextDisplay$TextAlignment", name, desc ); + return; + } + if ( modern ) { if ( owner.equals( "org/bukkit/Material" ) ) @@ -305,6 +312,22 @@ public class Commodore super.visitMethodInsn( opcode, owner, name, "(I)Lorg/bukkit/map/MapView;", itf ); return; } + // SPIGOT-7335 + if ( owner.equals( "org/bukkit/entity/TextDisplay$TextAligment" ) ) + { + super.visitMethodInsn( opcode, "org/bukkit/entity/TextDisplay$TextAlignment", name, desc, itf ); + return; + } + if ( desc.equals( "(Lorg/bukkit/entity/TextDisplay$TextAligment;)V" ) ) + { + super.visitMethodInsn( opcode, owner, name, "(Lorg/bukkit/entity/TextDisplay$TextAlignment;)V", itf ); + return; + } + if ( desc.equals( "()Lorg/bukkit/entity/TextDisplay$TextAligment;" ) ) + { + super.visitMethodInsn( opcode, owner, name, "()Lorg/bukkit/entity/TextDisplay$TextAlignment;", itf ); + return; + } if ( modern ) {