diff options
| author | peterbell10 <peterbell10@live.co.uk> | 2018-08-29 02:51:25 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-29 02:51:25 +0200 |
| commit | ee8419701472be9f24c51a41ee7b7ef3cf38f329 (patch) | |
| tree | b689d4657ec4bb2de7e47f43f670e99b564f85a7 /src/BlockEntities | |
| parent | Store and pass entity effect duration as an int not a short. (#4293) (diff) | |
| download | cuberite-ee8419701472be9f24c51a41ee7b7ef3cf38f329.tar cuberite-ee8419701472be9f24c51a41ee7b7ef3cf38f329.tar.gz cuberite-ee8419701472be9f24c51a41ee7b7ef3cf38f329.tar.bz2 cuberite-ee8419701472be9f24c51a41ee7b7ef3cf38f329.tar.lz cuberite-ee8419701472be9f24c51a41ee7b7ef3cf38f329.tar.xz cuberite-ee8419701472be9f24c51a41ee7b7ef3cf38f329.tar.zst cuberite-ee8419701472be9f24c51a41ee7b7ef3cf38f329.zip | |
Diffstat (limited to 'src/BlockEntities')
| -rw-r--r-- | src/BlockEntities/BlockEntityWithItems.h | 2 | ||||
| -rw-r--r-- | src/BlockEntities/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | src/BlockEntities/EnderChestEntity.h | 2 | ||||
| -rw-r--r-- | src/BlockEntities/FlowerPotEntity.h | 2 | ||||
| -rw-r--r-- | src/BlockEntities/JukeboxEntity.cpp | 2 | ||||
| -rw-r--r-- | src/BlockEntities/MobHeadEntity.h | 4 |
6 files changed, 6 insertions, 9 deletions
diff --git a/src/BlockEntities/BlockEntityWithItems.h b/src/BlockEntities/BlockEntityWithItems.h index 65fdf3c0d..f2455699a 100644 --- a/src/BlockEntities/BlockEntityWithItems.h +++ b/src/BlockEntities/BlockEntityWithItems.h @@ -12,7 +12,7 @@ #include "BlockEntity.h" #include "../ItemGrid.h" #include "../UI/WindowOwner.h" -#include "World.h" +#include "../World.h" diff --git a/src/BlockEntities/CMakeLists.txt b/src/BlockEntities/CMakeLists.txt index f3d0beb55..859b845e6 100644 --- a/src/BlockEntities/CMakeLists.txt +++ b/src/BlockEntities/CMakeLists.txt @@ -1,6 +1,3 @@ -project (Cuberite) - -include_directories ("${PROJECT_SOURCE_DIR}/../") SET (SRCS BeaconEntity.cpp diff --git a/src/BlockEntities/EnderChestEntity.h b/src/BlockEntities/EnderChestEntity.h index acd7bbdec..5cd327bb6 100644 --- a/src/BlockEntities/EnderChestEntity.h +++ b/src/BlockEntities/EnderChestEntity.h @@ -2,7 +2,7 @@ #pragma once #include "BlockEntity.h" -#include "UI/WindowOwner.h" +#include "../UI/WindowOwner.h" diff --git a/src/BlockEntities/FlowerPotEntity.h b/src/BlockEntities/FlowerPotEntity.h index 00ddc1442..cf31c7bdf 100644 --- a/src/BlockEntities/FlowerPotEntity.h +++ b/src/BlockEntities/FlowerPotEntity.h @@ -9,7 +9,7 @@ #pragma once #include "BlockEntity.h" -#include "Item.h" +#include "../Item.h" diff --git a/src/BlockEntities/JukeboxEntity.cpp b/src/BlockEntities/JukeboxEntity.cpp index df699b362..8b909adf4 100644 --- a/src/BlockEntities/JukeboxEntity.cpp +++ b/src/BlockEntities/JukeboxEntity.cpp @@ -5,7 +5,7 @@ #include "../World.h" #include "../EffectID.h" #include "json/value.h" -#include "Entities/Player.h" +#include "../Entities/Player.h" diff --git a/src/BlockEntities/MobHeadEntity.h b/src/BlockEntities/MobHeadEntity.h index fe0ae71e4..8072000cd 100644 --- a/src/BlockEntities/MobHeadEntity.h +++ b/src/BlockEntities/MobHeadEntity.h @@ -9,8 +9,8 @@ #pragma once #include "BlockEntity.h" -#include "Defines.h" -#include "UUID.h" +#include "../Defines.h" +#include "../UUID.h" |