Skip to content

Commit 348abd9

Browse files
committed
fix chat head crash
1 parent 9b50f58 commit 348abd9

File tree

2 files changed

+21
-17
lines changed

2 files changed

+21
-17
lines changed

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
org.gradle.jvmargs=-Xmx2G
22
mod_name = Chatting
33
mod_id = chatting
4-
mod_version = 1.4.2-beta3
4+
mod_version = 1.4.2-beta4
55

66
loom.platform = forge
77
minecraft.version = "1.8.9-forge"

src/main/java/cc/woverflow/chatting/mixin/ChatLineMixin.java

Lines changed: 20 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -34,26 +34,30 @@ public class ChatLineMixin implements ChatLineHook {
3434
private void onInit(int i, IChatComponent iChatComponent, int j, CallbackInfo ci) {
3535
chatLines.add(new WeakReference<>((ChatLine) (Object) this));
3636
NetHandlerPlayClient netHandler = Minecraft.getMinecraft().getNetHandler();
37+
if (netHandler == null) return;
3738
Map<String, NetworkPlayerInfo> nicknameCache = new HashMap<>();
38-
for (String word : iChatComponent.getFormattedText().split("(§.)|\\W")) {
39-
if (word.isEmpty()) continue;
40-
playerInfo = netHandler.getPlayerInfo(word);
41-
if (playerInfo == null) {
42-
playerInfo = getPlayerFromNickname(word, netHandler, nicknameCache);
43-
}
44-
if (playerInfo != null) {
45-
detectedPlayerInfo = playerInfo;
46-
detected = true;
47-
if (playerInfo == lastPlayerInfo) {
48-
first = false;
49-
if (ChattingConfig.INSTANCE.getHideChatHeadOnConsecutiveMessages()) {
50-
playerInfo = null;
39+
try {
40+
for (String word : iChatComponent.getFormattedText().split("(§.)|\\W")) {
41+
if (word.isEmpty()) continue;
42+
playerInfo = netHandler.getPlayerInfo(word);
43+
if (playerInfo == null) {
44+
playerInfo = getPlayerFromNickname(word, netHandler, nicknameCache);
45+
}
46+
if (playerInfo != null) {
47+
detectedPlayerInfo = playerInfo;
48+
detected = true;
49+
if (playerInfo == lastPlayerInfo) {
50+
first = false;
51+
if (ChattingConfig.INSTANCE.getHideChatHeadOnConsecutiveMessages()) {
52+
playerInfo = null;
53+
}
54+
} else {
55+
lastPlayerInfo = playerInfo;
5156
}
52-
} else {
53-
lastPlayerInfo = playerInfo;
57+
break;
5458
}
55-
break;
5659
}
60+
} catch (Exception ignored) {
5761
}
5862
}
5963

0 commit comments

Comments
 (0)