Skip to content

Commit cc4ea71

Browse files
committed
Fix custom name in banners etc. in 1.21.5->1.21.4
1 parent f288f2d commit cc4ea71

File tree

2 files changed

+12
-2
lines changed

2 files changed

+12
-2
lines changed

common/src/main/java/com/viaversion/viabackwards/protocol/v1_21_5to1_21_4/rewriter/BlockItemPacketRewriter1_21_5.java

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@
7878
import com.viaversion.viaversion.util.Either;
7979
import com.viaversion.viaversion.util.Key;
8080
import com.viaversion.viaversion.util.Limit;
81+
import com.viaversion.viaversion.util.SerializerVersion;
8182
import java.util.ArrayList;
8283
import java.util.HashMap;
8384
import java.util.List;
@@ -298,10 +299,19 @@ private void sendSaddledEntityData(final UserConnection connection, final Tracke
298299

299300
private void handleBlockEntity(final UserConnection connection, final BlockEntity blockEntity) {
300301
final CompoundTag tag = blockEntity.tag();
301-
if (tag != null && (blockEntity.typeId() == SIGN_BOCK_ENTITY_ID || blockEntity.typeId() == HANGING_SIGN_BOCK_ENTITY_ID)) {
302+
if (tag == null) {
303+
return;
304+
}
305+
306+
if (blockEntity.typeId() == SIGN_BOCK_ENTITY_ID || blockEntity.typeId() == HANGING_SIGN_BOCK_ENTITY_ID) {
302307
updateSignMessages(connection, tag.getCompoundTag("front_text"));
303308
updateSignMessages(connection, tag.getCompoundTag("back_text"));
304309
}
310+
311+
final Tag customName = tag.get("CustomName");
312+
if (customName != null) {
313+
tag.putString("CustomName", protocol.getComponentRewriter().toUglyJson(connection, customName));
314+
}
305315
}
306316

307317
private void updateSignMessages(final UserConnection connection, final CompoundTag tag) {

common/src/main/java/com/viaversion/viabackwards/protocol/v1_21_5to1_21_4/rewriter/ComponentRewriter1_21_5.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@ private void updateShowEntityHover(final CompoundTag hoverEventTag) {
254254
}
255255
}
256256

257-
private String toUglyJson(final UserConnection connection, final Tag value) {
257+
String toUglyJson(final UserConnection connection, final Tag value) {
258258
processTag(connection, value);
259259
return SerializerVersion.V1_21_4.toString(SerializerVersion.V1_21_4.toComponent(value));
260260
}

0 commit comments

Comments
 (0)