From 7f372b12cb01f7df9d5466de11b36494353613a8 Mon Sep 17 00:00:00 2001 From: Tiger Wang Date: Sat, 12 Sep 2020 21:08:23 +0100 Subject: Add State enum to protocol --- src/Protocol/Protocol_1_14.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/Protocol/Protocol_1_14.cpp') diff --git a/src/Protocol/Protocol_1_14.cpp b/src/Protocol/Protocol_1_14.cpp index c3e4a62d0..335677155 100644 --- a/src/Protocol/Protocol_1_14.cpp +++ b/src/Protocol/Protocol_1_14.cpp @@ -226,7 +226,7 @@ std::pair cProtocol_1_14::GetItemFromProtocolID(UInt32 a_ProtocolI UInt32 cProtocol_1_14::GetProtocolBlockType(BLOCKTYPE a_BlockType, NIBBLETYPE a_Meta) { - return Palette_1_14::From(PaletteUpgrade::FromBlock(a_BlockType, a_Meta)); + return Palette_1_14::FromBlock(PaletteUpgrade::FromBlock(a_BlockType, a_Meta)); } @@ -235,7 +235,7 @@ UInt32 cProtocol_1_14::GetProtocolBlockType(BLOCKTYPE a_BlockType, NIBBLETYPE a_ UInt32 cProtocol_1_14::GetProtocolItemType(short a_ItemID, short a_ItemDamage) { - return Palette_1_14::From(PaletteUpgrade::FromItem(a_ItemID, a_ItemDamage)); + return Palette_1_14::FromItem(PaletteUpgrade::FromItem(a_ItemID, a_ItemDamage)); } @@ -253,7 +253,7 @@ UInt32 cProtocol_1_14::GetProtocolStatisticType(Statistic a_Statistic) bool cProtocol_1_14::HandlePacket(cByteBuffer & a_ByteBuffer, UInt32 a_PacketType) { - if (m_State != 3) + if (m_State != State::Game) { return Super::HandlePacket(a_ByteBuffer, a_PacketType); } -- cgit v1.2.3