diff options
| author | daniel0916 <theschokolps@gmail.com> | 2014-04-07 20:25:30 +0200 |
|---|---|---|
| committer | daniel0916 <theschokolps@gmail.com> | 2014-04-07 20:25:30 +0200 |
| commit | 1dfd2b1c5fe125757aeb084c163aec5b25a55fc2 (patch) | |
| tree | e1f5a304a1369b3ad04b5a5ddb851c2f842a6fdf | |
| parent | Added deleted things for merging (diff) | |
| download | cuberite-1dfd2b1c5fe125757aeb084c163aec5b25a55fc2.tar cuberite-1dfd2b1c5fe125757aeb084c163aec5b25a55fc2.tar.gz cuberite-1dfd2b1c5fe125757aeb084c163aec5b25a55fc2.tar.bz2 cuberite-1dfd2b1c5fe125757aeb084c163aec5b25a55fc2.tar.lz cuberite-1dfd2b1c5fe125757aeb084c163aec5b25a55fc2.tar.xz cuberite-1dfd2b1c5fe125757aeb084c163aec5b25a55fc2.tar.zst cuberite-1dfd2b1c5fe125757aeb084c163aec5b25a55fc2.zip | |
| -rw-r--r-- | src/Blocks/BlockEnchantmentTable.h | 2 | ||||
| -rw-r--r-- | src/Protocol/Protocol125.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/Blocks/BlockEnchantmentTable.h b/src/Blocks/BlockEnchantmentTable.h index e8a87179b..81d2cb9a0 100644 --- a/src/Blocks/BlockEnchantmentTable.h +++ b/src/Blocks/BlockEnchantmentTable.h @@ -19,7 +19,7 @@ public: } - virtual void OnUse(cWorld * a_World, cPlayer * a_Player, int a_BlockX, int a_BlockY, int a_BlockZ, char a_BlockFace, int a_CursorX, int a_CursorY, int a_CursorZ) override + virtual void OnUse(cChunkInterface & a_ChunkInterface, cWorldInterface & a_WorldInterface, cPlayer * a_Player, int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace, int a_CursorX, int a_CursorY, int a_CursorZ) override { cWindow * Window = new cEnchantingWindow(a_BlockX, a_BlockY, a_BlockZ); a_Player->OpenWindow(Window); diff --git a/src/Protocol/Protocol125.cpp b/src/Protocol/Protocol125.cpp index 867cf3ef3..26f109918 100644 --- a/src/Protocol/Protocol125.cpp +++ b/src/Protocol/Protocol125.cpp @@ -1601,8 +1601,8 @@ int cProtocol125::ParseUseEntity(void) int cProtocol125::ParseEnchantItem(void) { - HANDLE_PACKET_READ(ReadByte, byte, WindowID); - HANDLE_PACKET_READ(ReadByte, byte, Enchantment); + HANDLE_PACKET_READ(ReadByte, Byte, WindowID); + HANDLE_PACKET_READ(ReadByte, Byte, Enchantment); LOGWARN("Older Protocol: Enchantment Packet received!"); |