Skip to content

Commit 1e17e72

Browse files
committed
Fix death messages being broken on 1.20.
1 parent ddcb358 commit 1e17e72

File tree

1 file changed

+4
-5
lines changed

1 file changed

+4
-5
lines changed

src/utilities/connection/packetHandler.ts

+4-5
Original file line numberDiff line numberDiff line change
@@ -189,18 +189,17 @@ export const packetHandler =
189189
if (action !== 2) return
190190
data = data.slice(actionLen)
191191
}
192-
data = data.slice(readVarInt(data)[1] + 4) // Remove Player/Entity ID
192+
data = data.slice(readVarInt(data)[1]) // Remove Player ID
193+
if (version <= protocolMap['1.19.4']) data = data.slice(4) // Remove Killer ID
193194
const [chatLen, chatViLength] = readVarInt(data)
194195
const deathMessage = parseValidJson(
195196
data.slice(chatViLength, chatViLength + chatLen).toString('utf8')
196197
)
197198
if (
198199
(typeof deathMessage === 'string' && deathMessage.trim()) ||
199-
deathMessage?.text ||
200-
deathMessage?.extra?.length > 0
201-
) {
200+
Object.keys(deathMessage).length !== 0
201+
)
202202
addMessage(deathMessage)
203-
}
204203
// Automatically respawn.
205204
// LOW-TODO: Should this be manual, or a dialog, like MC?
206205
addMessage(deathRespawnMessage)

0 commit comments

Comments
 (0)