From 6207647aae96021a113e30c2b0acef83c3d0b728 Mon Sep 17 00:00:00 2001 From: "Five (Xer)" Date: Thu, 25 Feb 2021 14:49:29 +0100 Subject: [PATCH] Remove leftovers --- .../velocitypowered/proxy/protocol/StateRegistry.java | 10 +++++----- .../proxy/protocol/packet/title/TitleClearPacket.java | 4 +--- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/proxy/src/main/java/com/velocitypowered/proxy/protocol/StateRegistry.java b/proxy/src/main/java/com/velocitypowered/proxy/protocol/StateRegistry.java index 6baa55046..243239eb0 100644 --- a/proxy/src/main/java/com/velocitypowered/proxy/protocol/StateRegistry.java +++ b/proxy/src/main/java/com/velocitypowered/proxy/protocol/StateRegistry.java @@ -253,15 +253,15 @@ public enum StateRegistry { map(0x4F, MINECRAFT_1_14, true), map(0x50, MINECRAFT_1_15, true), map(0x4F, MINECRAFT_1_16, MINECRAFT_1_16_4, true)); - clientbound.register(TitleSubtitlePacket.class, TitleSubtitlePacket::new, // TODO: fix + clientbound.register(TitleSubtitlePacket.class, TitleSubtitlePacket::new, map(0x57, MINECRAFT_1_17, true)); - clientbound.register(TitleTextPacket.class, TitleTextPacket::new, // TODO: fix + clientbound.register(TitleTextPacket.class, TitleTextPacket::new, map(0x5A, MINECRAFT_1_17, true)); - clientbound.register(TitleActionbarPacket.class, TitleActionbarPacket::new, // TODO: fix + clientbound.register(TitleActionbarPacket.class, TitleActionbarPacket::new, map(0x41, MINECRAFT_1_17, true)); - clientbound.register(TitleTimesPacket.class, TitleTimesPacket::new, // TODO: fix + clientbound.register(TitleTimesPacket.class, TitleTimesPacket::new, map(0x59, MINECRAFT_1_17, true)); - clientbound.register(TitleClearPacket.class, TitleClearPacket::new, // TODO: fix + clientbound.register(TitleClearPacket.class, TitleClearPacket::new, map(0x10, MINECRAFT_1_17, true)); clientbound.register(PlayerListItem.class, PlayerListItem::new, map(0x38, MINECRAFT_1_7_2, false), diff --git a/proxy/src/main/java/com/velocitypowered/proxy/protocol/packet/title/TitleClearPacket.java b/proxy/src/main/java/com/velocitypowered/proxy/protocol/packet/title/TitleClearPacket.java index 8ee0289ab..626abb517 100644 --- a/proxy/src/main/java/com/velocitypowered/proxy/protocol/packet/title/TitleClearPacket.java +++ b/proxy/src/main/java/com/velocitypowered/proxy/protocol/packet/title/TitleClearPacket.java @@ -24,8 +24,6 @@ import io.netty.buffer.ByteBuf; public class TitleClearPacket extends GenericTitlePacket { - private boolean resetTimes; - public TitleClearPacket() { setAction(ActionType.HIDE); } @@ -46,7 +44,7 @@ public class TitleClearPacket extends GenericTitlePacket { @Override public String toString() { return "TitleClearPacket{" - + ", reset=" + resetTimes + + ", resetTimes=" + (getAction() == ActionType.RESET) + '}'; }