From b45d8bfc1e207c87acf7f524329dd02b9ea84be5 Mon Sep 17 00:00:00 2001 From: Alexander Harkness Date: Thu, 6 Aug 2020 12:36:13 +0100 Subject: [PATCH] Revert "Hotpatch optional for macOSX builds on buildserver" This reverts commit 5e3f51f5ff39ac7219f1f0fcbc27340949f95ade. --- src/Protocol/Protocol_1_12.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Protocol/Protocol_1_12.cpp b/src/Protocol/Protocol_1_12.cpp index 1f136148e..a67a82eaf 100644 --- a/src/Protocol/Protocol_1_12.cpp +++ b/src/Protocol/Protocol_1_12.cpp @@ -980,7 +980,7 @@ void cProtocol_1_12::HandleCraftRecipe(cByteBuffer & a_ByteBuffer) auto CuberiteRecipeId = cRoot::Get()->GetRecipeMapper()->GetCuberiteRecipeId(RecipeID, m_Client->GetProtocolVersion()); if (CuberiteRecipeId.has_value()) { - m_Client->HandleCraftRecipe(*CuberiteRecipeId); + m_Client->HandleCraftRecipe(CuberiteRecipeId.value()); } } @@ -1320,7 +1320,7 @@ void cProtocol_1_12_2::SendUnlockRecipe(UInt32 a_RecipeID) Pkt.WriteBool(true); Pkt.WriteBool(false); Pkt.WriteVarInt32(1); - Pkt.WriteVarInt32(*ProtocolRecipeId); + Pkt.WriteVarInt32(ProtocolRecipeId.value()); } } @@ -1350,8 +1350,8 @@ void cProtocol_1_12_2::SendInitRecipes(UInt32 a_RecipeID) else { Pkt.WriteVarInt32(1); - Pkt.WriteVarInt32(*ProtocolRecipeId); + Pkt.WriteVarInt32(ProtocolRecipeId.value()); Pkt.WriteVarInt32(1); - Pkt.WriteVarInt32(*ProtocolRecipeId); + Pkt.WriteVarInt32(ProtocolRecipeId.value()); } }