summaryrefslogtreecommitdiffstats
path: root/src/Protocol/Palettes/Upgrade.cpp
diff options
context:
space:
mode:
authorTiger Wang <ziwei.tiger@outlook.com>2020-07-18 23:45:04 +0200
committerTiger Wang <ziwei.tiger@outlook.com>2020-07-19 01:43:33 +0200
commit1b9b5877349b26b7b9029cf1802a2e9cad4bc301 (patch)
tree18f0accd515d91515ca2199f790467c8310ce67d /src/Protocol/Palettes/Upgrade.cpp
parentDelete unused member (diff)
downloadcuberite-1b9b5877349b26b7b9029cf1802a2e9cad4bc301.tar
cuberite-1b9b5877349b26b7b9029cf1802a2e9cad4bc301.tar.gz
cuberite-1b9b5877349b26b7b9029cf1802a2e9cad4bc301.tar.bz2
cuberite-1b9b5877349b26b7b9029cf1802a2e9cad4bc301.tar.lz
cuberite-1b9b5877349b26b7b9029cf1802a2e9cad4bc301.tar.xz
cuberite-1b9b5877349b26b7b9029cf1802a2e9cad4bc301.tar.zst
cuberite-1b9b5877349b26b7b9029cf1802a2e9cad4bc301.zip
Diffstat (limited to 'src/Protocol/Palettes/Upgrade.cpp')
-rw-r--r--src/Protocol/Palettes/Upgrade.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/Protocol/Palettes/Upgrade.cpp b/src/Protocol/Palettes/Upgrade.cpp
index 23e7681a3..671810b7a 100644
--- a/src/Protocol/Palettes/Upgrade.cpp
+++ b/src/Protocol/Palettes/Upgrade.cpp
@@ -1703,9 +1703,9 @@ namespace PaletteUpgrade
}
}
- Item FromItem(short Item, short Meta)
+ Item FromItem(short Item, short Damage)
{
- switch ((Item << 16) | Meta)
+ switch ((Item << 16) | Damage)
{
case (1 << 16) | 0: return Item::Stone;
case (1 << 16) | 1: return Item::Granite;