Skip to content

Commit 8bec05e

Browse files
authored
Fixup hardcore handling on join in 1.8->1.9 (ViaVersion#3946)
* Fix players crashing when logging into a 1.8 server on hardcore mode, Fixes ViaVersion#3944 * Requested change to ViaVersion#3944 fix
1 parent b367caa commit 8bec05e

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

common/src/main/java/com/viaversion/viaversion/protocols/v1_8to1_9/rewriter/PlayerPacketRewriter1_9.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,9 @@ public void register() {
196196

197197
handler(wrapper -> {
198198
EntityTracker1_9 tracker = wrapper.user().getEntityTracker(Protocol1_8To1_9.class);
199-
tracker.setGameMode(GameMode.getById(wrapper.get(Types.UNSIGNED_BYTE, 0))); //Set player gamemode
199+
short gamemodeId = wrapper.get(Types.UNSIGNED_BYTE, 0);
200+
gamemodeId &= -9; // remove the hardcore mode flag
201+
tracker.setGameMode(GameMode.getById(gamemodeId)); //Set player gamemode
200202
});
201203

202204
// Track player's dimension

0 commit comments

Comments
 (0)