Skip to content

Commit cbe81d1

Browse files
committed
Change design to existing design
1 parent 2a0ac8f commit cbe81d1

File tree

1 file changed

+3
-14
lines changed

1 file changed

+3
-14
lines changed

api/src/main/java/com/github/retrooper/packetevents/wrapper/play/client/WrapperPlayClientChatMessage.java

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
import com.github.retrooper.packetevents.protocol.packettype.PacketType;
2525
import com.github.retrooper.packetevents.protocol.player.ClientVersion;
2626
import com.github.retrooper.packetevents.util.crypto.MessageSignData;
27-
import com.github.retrooper.packetevents.util.crypto.SaltSignature;
2827
import com.github.retrooper.packetevents.wrapper.PacketWrapper;
2928
import org.jetbrains.annotations.Nullable;
3029

@@ -35,17 +34,7 @@
3534
* This packet is used to send a chat message to the server.
3635
*/
3736
public class WrapperPlayClientChatMessage extends PacketWrapper<WrapperPlayClientChatMessage> {
38-
private static int getLegacyMaxChatLength() {
39-
final String value = System.getProperty("packetevents.legacyClientChatMaxLength");
40-
if (value != null) {
41-
try {
42-
return Integer.parseInt(value.trim());
43-
} catch (final NumberFormatException e) {
44-
// Exception has been handled
45-
}
46-
}
47-
return 100;
48-
}
37+
private static final int LEGACY_MAX_LENGTH = Integer.getInteger("packetevents.default-legacy-chat-max-length", 100);
4938

5039
private String message;
5140
private MessageSignData messageSignData;
@@ -72,7 +61,7 @@ public WrapperPlayClientChatMessage(String message, MessageSignData messageSignD
7261

7362
@Override
7463
public void read() {
75-
int maxMessageLength = serverVersion.isNewerThanOrEquals(ServerVersion.V_1_11) ? 256 : getLegacyMaxChatLength();
64+
int maxMessageLength = serverVersion.isNewerThanOrEquals(ServerVersion.V_1_11) ? 256 : LEGACY_MAX_LENGTH;
7665
this.message = readString(maxMessageLength);
7766
if (serverVersion.isNewerThanOrEquals(ServerVersion.V_1_19)) {
7867
Instant timestamp = readTimestamp();
@@ -93,7 +82,7 @@ public void read() {
9382

9483
@Override
9584
public void write() {
96-
int maxMessageLength = serverVersion.isNewerThanOrEquals(ServerVersion.V_1_11) ? 256 : getLegacyMaxChatLength();
85+
int maxMessageLength = serverVersion.isNewerThanOrEquals(ServerVersion.V_1_11) ? 256 : LEGACY_MAX_LENGTH;
9786
writeString(this.message, maxMessageLength);
9887
if (serverVersion.isNewerThanOrEquals(ServerVersion.V_1_19)) {
9988
writeTimestamp(messageSignData.getTimestamp());

0 commit comments

Comments
 (0)