diff options
| author | Tiger Wang <ziwei.tiger@outlook.com> | 2020-12-21 14:54:04 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-21 14:54:04 +0100 |
| commit | 9518a273570e8d38438c2a29aa10f987e7d44ce1 (patch) | |
| tree | 11806582f5e27bad01ae96705f75f431ec3e9caf /src/Protocol/Palettes/Upgrade.cpp | |
| parent | Improve Enderman targeting (diff) | |
| download | cuberite-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/Palettes/Upgrade.cpp')
| -rw-r--r-- | src/Protocol/Palettes/Upgrade.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/Protocol/Palettes/Upgrade.cpp b/src/Protocol/Palettes/Upgrade.cpp index 8805a7d31..7dbeea8e5 100644 --- a/src/Protocol/Palettes/Upgrade.cpp +++ b/src/Protocol/Palettes/Upgrade.cpp @@ -1,11 +1,11 @@ #include "Globals.h" #include "Upgrade.h" -#include "../../Registries/Blocks.h" +#include "Registries/BlockStates.h" namespace PaletteUpgrade { - short FromBlock(BLOCKTYPE Block, NIBBLETYPE Meta) + BlockState FromBlock(const BLOCKTYPE Block, const NIBBLETYPE Meta) { using namespace Block; @@ -1705,7 +1705,7 @@ namespace PaletteUpgrade } } - Item FromItem(short Item, short Damage) + Item FromItem(const short Item, const short Damage) { switch ((Item << 16) | Damage) { @@ -2516,7 +2516,7 @@ namespace PaletteUpgrade } } - std::pair<short, short> ToItem(Item ID) + std::pair<short, short> ToItem(const Item ID) { switch (ID) { |