helpy4/Minecraft-Console-Client
1
0
Fork 0
mirror of https://github.com/MCCTeam/Minecraft-Console-Client synced 2025-10-14 21:22:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix The End terrain load crash for 1.9+

Browse source 
Bug report by TNTUP, See #173
This commit is contained in:
ORelio 2016-07-22 23:48:14 +02:00
parent b99edee642
commit e8f51ca22b
1 changed files with 31 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

59
MinecraftClient/Protocol/Handlers/Protocol18.cs
View file

@ -629,38 +629,41 @@ namespace MinecraftClient.Protocol.Handlers
Chunk chunk = new Chunk(); Chunk chunk = new Chunk();
for (int blockY = 0; blockY < Chunk.SizeY; blockY++) if (dataArray.Length > 0)
{ {
for (int blockZ = 0; blockZ < Chunk.SizeZ; blockZ++) for (int blockY = 0; blockY < Chunk.SizeY; blockY++)
{ {
for (int blockX = 0; blockX < Chunk.SizeX; blockX++) for (int blockZ = 0; blockZ < Chunk.SizeZ; blockZ++)
{ {
int blockNumber = (blockY * Chunk.SizeZ + blockZ) * Chunk.SizeX + blockX; for (int blockX = 0; blockX < Chunk.SizeX; blockX++)
int startLong = (blockNumber * bitsPerBlock) / 64;
int startOffset = (blockNumber * bitsPerBlock) % 64;
int endLong = ((blockNumber + 1) * bitsPerBlock - 1) / 64;
// TODO: In the future a single ushort may not store the entire block id;
// the Block code may need to change.
ushort blockId;
if (startLong == endLong)
{ {
blockId = (ushort)((dataArray[startLong] >> startOffset) & valueMask); int blockNumber = (blockY * Chunk.SizeZ + blockZ) * Chunk.SizeX + blockX;
}
else
{
int endOffset = 64 - startOffset;
blockId = (ushort)((dataArray[startLong] >> startOffset | dataArray[endLong] << endOffset) & valueMask);
}
if (usePalette) int startLong = (blockNumber * bitsPerBlock) / 64;
{ int startOffset = (blockNumber * bitsPerBlock) % 64;
// Get the real block ID out of the palette int endLong = ((blockNumber + 1) * bitsPerBlock - 1) / 64;
blockId = (ushort)palette[blockId];
}
chunk[blockX, blockY, blockZ] = new Block(blockId); // TODO: In the future a single ushort may not store the entire block id;
// the Block code may need to change.
ushort blockId;
if (startLong == endLong)
{
blockId = (ushort)((dataArray[startLong] >> startOffset) & valueMask);
}
else
{
int endOffset = 64 - startOffset;
blockId = (ushort)((dataArray[startLong] >> startOffset | dataArray[endLong] << endOffset) & valueMask);
}
if (usePalette)
{
// Get the real block ID out of the palette
blockId = (ushort)palette[blockId];
}
chunk[blockX, blockY, blockZ] = new Block(blockId);
}
} }
} }
} }
@ -674,8 +677,8 @@ namespace MinecraftClient.Protocol.Handlers
readData((Chunk.SizeX * Chunk.SizeY * Chunk.SizeZ) / 2, cache); readData((Chunk.SizeX * Chunk.SizeY * Chunk.SizeZ) / 2, cache);
//Skip sky light //Skip sky light
if (this.currentDimension != -1) if (this.currentDimension == 0)
// Sky light is not sent in the nether // Sky light is not sent in the nether or the end
readData((Chunk.SizeX * Chunk.SizeY * Chunk.SizeZ) / 2, cache); readData((Chunk.SizeX * Chunk.SizeY * Chunk.SizeZ) / 2, cache);
} }
} }