AstralTransRocketries/ClassiCube
1
0
Fork 0
mirror of https://github.com/ClassiCube/ClassiCube.git synced 2025-09-17 19:45:23 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix InventoryOrder for 16 bit blocks

Browse Source
This commit is contained in:
UnknownShadow200 2018-03-09 09:12:45 +11:00
parent 467c79ee28
commit a1866c29e2
3 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ClassicalSharp/Network/CPESupport.cs
View File

@ -71,7 +71,7 @@ namespace ClassicalSharp.Network {
net.packetSizes[Opcode.CpeSetBlockPermission] += 1; net.packetSizes[Opcode.CpeSetBlockPermission] += 1;
net.packetSizes[Opcode.CpeUndefineBlock] += 1; net.packetSizes[Opcode.CpeUndefineBlock] += 1;
net.packetSizes[Opcode.CpeDefineBlockExt] += 1; net.packetSizes[Opcode.CpeDefineBlockExt] += 1;
net.packetSizes[Opcode.CpeSetInventoryOrder] += 1; net.packetSizes[Opcode.CpeSetInventoryOrder] += 2;
// TODO: do this one more efficiently // TODO: do this one more efficiently
net.packetSizes[Opcode.CpeBulkBlockUpdate] += 256; net.packetSizes[Opcode.CpeBulkBlockUpdate] += 256;

4
ClassicalSharp/Network/Protocols/CPE.cs
View File

@ -398,10 +398,10 @@ namespace ClassicalSharp.Network.Protocols {
void HandleSetInventoryOrder() { void HandleSetInventoryOrder() {
BlockID block = reader.ReadBlock(); BlockID block = reader.ReadBlock();
byte order = reader.ReadUInt8(); BlockID order = reader.ReadBlock();
game.Inventory.Remove(block); game.Inventory.Remove(block);
if (order != Block.Invalid) { if (order != 255) {
game.Inventory.Insert(order, block); game.Inventory.Insert(order, block);
} }
} }

4
Launcher2/Patcher/ResourceFetcher.cs
View File

@ -23,10 +23,6 @@ namespace Launcher.Patcher {
const string jar162Uri = "http://s3.amazonaws.com/Minecraft.Download/versions/1.6.2/1.6.2.jar"; const string jar162Uri = "http://s3.amazonaws.com/Minecraft.Download/versions/1.6.2/1.6.2.jar";
const string pngTerrainPatchUri = "http://static.classicube.net/terrain-patch2.png"; const string pngTerrainPatchUri = "http://static.classicube.net/terrain-patch2.png";
const string pngGuiPatchUri = "http://static.classicube.net/gui.png"; const string pngGuiPatchUri = "http://static.classicube.net/gui.png";
const string digSoundsUri = "http://s3.amazonaws.com/MinecraftResources/sound3/dig/";
const string altDigSoundsUri = "http://s3.amazonaws.com/MinecraftResources/sound3/random/";
const string stepSoundsUri = "http://s3.amazonaws.com/MinecraftResources/newsound/step/";
const string altStepSoundsUri = "http://s3.amazonaws.com/MinecraftResources/sound3/step/";
public const string assetsUri = "http://resources.download.minecraft.net/"; public const string assetsUri = "http://resources.download.minecraft.net/";
public void DownloadItems(AsyncDownloader downloader, Action<string> setStatus) { public void DownloadItems(AsyncDownloader downloader, Action<string> setStatus) {