summaryrefslogtreecommitdiffstats
path: root/src/Protocol/Protocol_1_14.cpp
diff options
context:
space:
mode:
authorTiger Wang <ziwei.tiger@outlook.com>2020-12-21 14:54:04 +0100
committerGitHub <noreply@github.com>2020-12-21 14:54:04 +0100
commit9518a273570e8d38438c2a29aa10f987e7d44ce1 (patch)
tree11806582f5e27bad01ae96705f75f431ec3e9caf /src/Protocol/Protocol_1_14.cpp
parentImprove Enderman targeting (diff)
downloadcuberite-9518a273570e8d38438c2a29aa10f987e7d44ce1.tar
cuberite-9518a273570e8d38438c2a29aa10f987e7d44ce1.tar.gz
cuberite-9518a273570e8d38438c2a29aa10f987e7d44ce1.tar.bz2
cuberite-9518a273570e8d38438c2a29aa10f987e7d44ce1.tar.lz
cuberite-9518a273570e8d38438c2a29aa10f987e7d44ce1.tar.xz
cuberite-9518a273570e8d38438c2a29aa10f987e7d44ce1.tar.zst
cuberite-9518a273570e8d38438c2a29aa10f987e7d44ce1.zip
Diffstat (limited to 'src/Protocol/Protocol_1_14.cpp')
-rw-r--r--src/Protocol/Protocol_1_14.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/Protocol/Protocol_1_14.cpp b/src/Protocol/Protocol_1_14.cpp
index f93a044d7..47d2162c2 100644
--- a/src/Protocol/Protocol_1_14.cpp
+++ b/src/Protocol/Protocol_1_14.cpp
@@ -196,7 +196,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::FromBlock(PaletteUpgrade::FromBlock(a_BlockType, a_Meta));
+ return Palette_1_14::From(PaletteUpgrade::FromBlock(a_BlockType, a_Meta));
}
@@ -205,7 +205,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::FromItem(PaletteUpgrade::FromItem(a_ItemID, a_ItemDamage));
+ return Palette_1_14::From(PaletteUpgrade::FromItem(a_ItemID, a_ItemDamage));
}