SteamWar/Velocity
12
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Fix dimension reading for some mods that add extra dimensions in 1.7.10 (#1734)"

Browse Source 
This reverts commit 2676520c6a.
This commit is contained in:
Shane Freeder
2026-08-03 14:09:05 +01:00
parent 06ade4775e
commit 00759e5279
1 changed files with 1 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
proxy/src/main/java/com/velocitypowered/proxy/protocol/packet/JoinGamePacket.java
+1 -11
View File
@@ -245,17 +245,7 @@ public class JoinGamePacket implements MinecraftPacket {
if (version.noLessThan(ProtocolVersion.MINECRAFT_1_9_1)) { if (version.noLessThan(ProtocolVersion.MINECRAFT_1_9_1)) {
this.dimension = buf.readInt(); this.dimension = buf.readInt();
} else { } else {
// Vanilla 1.7.10 uses a signed byte for dimension (-1 Nether, 0 Overworld, 1 End). this.dimension = buf.readByte();
// Modded servers hack this to an unsigned byte to allow dim IDs up to 255.
// We must store the canonical int here because RespawnPacket.fromJoinGame copies this
// value into a packet that encodes dimension as a 4-byte int (RespawnPacket.encode,
// pre-1.16 logic). Sign-extending a modded byte like 0xB4 to int -76 sends an
// illegal dimension ID to the client and crashes it.
//
// The wire byte is ambiguous: 0xFF could be vanilla Nether (-1) or modded dim 255.
// We resolve in Nether's favor since vanilla 1.7.10 only ever uses -1/0/1.
short raw = buf.readUnsignedByte();
this.dimension = raw == 0xFF ? -1 : raw;
} }
if (version.noGreaterThan(ProtocolVersion.MINECRAFT_1_13_2)) { if (version.noGreaterThan(ProtocolVersion.MINECRAFT_1_13_2)) {
this.difficulty = buf.readUnsignedByte(); this.difficulty = buf.readUnsignedByte();