Skip to content

Commit fa528c3

Browse files
committed
Fix scoreboard title handling for 1.8-1.12
1 parent 443e731 commit fa528c3

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

src/main/java/me/rothes/protocolstringreplacer/packetlisteners/server/scoreboard/ScoreBoardObjective.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,22 +8,23 @@
88
import me.rothes.protocolstringreplacer.ProtocolStringReplacer;
99
import me.rothes.protocolstringreplacer.api.user.PsrUser;
1010
import me.rothes.protocolstringreplacer.replacer.ListenType;
11+
import org.jetbrains.annotations.NotNull;
1112

1213
public class ScoreBoardObjective extends AbstractScoreBoardListener {
1314

1415
public ScoreBoardObjective() {
1516
super(PacketType.Play.Server.SCOREBOARD_OBJECTIVE, ListenType.SCOREBOARD);
1617
}
1718

18-
protected void process(PacketEvent packetEvent) {
19+
protected void process(@NotNull PacketEvent packetEvent) {
1920
PsrUser user = getEventUser(packetEvent);
2021
if (user == null) {
2122
return;
2223
}
2324
PacketContainer packet = packetEvent.getPacket();
2425

2526
if (packet.getIntegers().read(0) != 1) {
26-
if (ProtocolStringReplacer.getInstance().getServerMajorVersion() > 12) {
27+
if (ProtocolStringReplacer.getInstance().getServerMajorVersion() >= 13) {
2728
StructureModifier<WrappedChatComponent> wrappedChatComponentStructureModifier = packet.getChatComponents();
2829
WrappedChatComponent wrappedChatComponent = wrappedChatComponentStructureModifier.read(0);
2930
String replaced = getReplacedJson(packetEvent, user, listenType, wrappedChatComponent.getJson(), titleFilter);
@@ -32,9 +33,9 @@ protected void process(PacketEvent packetEvent) {
3233
}
3334
} else {
3435
StructureModifier<String> strings = packet.getStrings();
35-
String replaced = getReplacedText(packetEvent, user, listenType, strings.read(0), titleFilter);
36+
String replaced = getReplacedText(packetEvent, user, listenType, strings.read(1), titleFilter);
3637
if (replaced != null)
37-
strings.write(0, replaced);
38+
strings.write(1, replaced);
3839
}
3940
}
4041
}

0 commit comments

Comments
 (0)