From a1866c29e25175a651a60dd3bc94228b50bb69ae Mon Sep 17 00:00:00 2001 From: UnknownShadow200 Date: Fri, 9 Mar 2018 09:12:45 +1100 Subject: [PATCH] Fix InventoryOrder for 16 bit blocks --- ClassicalSharp/Network/CPESupport.cs | 2 +- ClassicalSharp/Network/Protocols/CPE.cs | 4 ++-- Launcher2/Patcher/ResourceFetcher.cs | 4 ---- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/ClassicalSharp/Network/CPESupport.cs b/ClassicalSharp/Network/CPESupport.cs index 484e58d7d..c2a3858df 100644 --- a/ClassicalSharp/Network/CPESupport.cs +++ b/ClassicalSharp/Network/CPESupport.cs @@ -71,7 +71,7 @@ namespace ClassicalSharp.Network { net.packetSizes[Opcode.CpeSetBlockPermission] += 1; net.packetSizes[Opcode.CpeUndefineBlock] += 1; net.packetSizes[Opcode.CpeDefineBlockExt] += 1; - net.packetSizes[Opcode.CpeSetInventoryOrder] += 1; + net.packetSizes[Opcode.CpeSetInventoryOrder] += 2; // TODO: do this one more efficiently net.packetSizes[Opcode.CpeBulkBlockUpdate] += 256; diff --git a/ClassicalSharp/Network/Protocols/CPE.cs b/ClassicalSharp/Network/Protocols/CPE.cs index 479838d37..35e5509b3 100644 --- a/ClassicalSharp/Network/Protocols/CPE.cs +++ b/ClassicalSharp/Network/Protocols/CPE.cs @@ -398,10 +398,10 @@ namespace ClassicalSharp.Network.Protocols { void HandleSetInventoryOrder() { BlockID block = reader.ReadBlock(); - byte order = reader.ReadUInt8(); + BlockID order = reader.ReadBlock(); game.Inventory.Remove(block); - if (order != Block.Invalid) { + if (order != 255) { game.Inventory.Insert(order, block); } } diff --git a/Launcher2/Patcher/ResourceFetcher.cs b/Launcher2/Patcher/ResourceFetcher.cs index ffb7f7156..f9577ffe9 100644 --- a/Launcher2/Patcher/ResourceFetcher.cs +++ b/Launcher2/Patcher/ResourceFetcher.cs @@ -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 pngTerrainPatchUri = "http://static.classicube.net/terrain-patch2.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 void DownloadItems(AsyncDownloader downloader, Action setStatus) {