diff options
| author | Tiger Wang <ziwei.tiger@outlook.com> | 2020-09-12 22:08:23 +0200 |
|---|---|---|
| committer | Tiger Wang <ziwei.tiger@outlook.com> | 2020-09-18 17:41:06 +0200 |
| commit | 7f372b12cb01f7df9d5466de11b36494353613a8 (patch) | |
| tree | cdc570e1e5318beba83cc3b165efa0704b2c0edb /src/Protocol/Protocol_1_14.cpp | |
| parent | Remove unused ServerPort member (diff) | |
| download | cuberite-7f372b12cb01f7df9d5466de11b36494353613a8.tar cuberite-7f372b12cb01f7df9d5466de11b36494353613a8.tar.gz cuberite-7f372b12cb01f7df9d5466de11b36494353613a8.tar.bz2 cuberite-7f372b12cb01f7df9d5466de11b36494353613a8.tar.lz cuberite-7f372b12cb01f7df9d5466de11b36494353613a8.tar.xz cuberite-7f372b12cb01f7df9d5466de11b36494353613a8.tar.zst cuberite-7f372b12cb01f7df9d5466de11b36494353613a8.zip | |
Diffstat (limited to 'src/Protocol/Protocol_1_14.cpp')
| -rw-r--r-- | src/Protocol/Protocol_1_14.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
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<short, short> 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); } |