diff options
author | madmaxoft <github@xoft.cz> | 2013-08-19 11:39:13 +0200 |
---|---|---|
committer | madmaxoft <github@xoft.cz> | 2013-08-19 11:39:13 +0200 |
commit | 1a7912744ff2e0abfeae0d2d75af80d73209580c (patch) | |
tree | e5372cdfece1852c00ed7b0219ad77ee82ea1858 /source/BlockEntities | |
parent | Fixed timed event wait on Linux. (diff) | |
download | cuberite-1a7912744ff2e0abfeae0d2d75af80d73209580c.tar cuberite-1a7912744ff2e0abfeae0d2d75af80d73209580c.tar.gz cuberite-1a7912744ff2e0abfeae0d2d75af80d73209580c.tar.bz2 cuberite-1a7912744ff2e0abfeae0d2d75af80d73209580c.tar.lz cuberite-1a7912744ff2e0abfeae0d2d75af80d73209580c.tar.xz cuberite-1a7912744ff2e0abfeae0d2d75af80d73209580c.tar.zst cuberite-1a7912744ff2e0abfeae0d2d75af80d73209580c.zip |
Diffstat (limited to '')
-rw-r--r-- | source/BlockEntities/ChestEntity.cpp | 3 | ||||
-rw-r--r-- | source/BlockEntities/DispenserEntity.cpp | 2 | ||||
-rw-r--r-- | source/BlockEntities/DropSpenserEntity.cpp | 2 | ||||
-rw-r--r-- | source/BlockEntities/DropperEntity.cpp | 2 | ||||
-rw-r--r-- | source/BlockEntities/FurnaceEntity.cpp | 2 | ||||
-rw-r--r-- | source/BlockEntities/HopperEntity.cpp | 2 | ||||
-rw-r--r-- | source/BlockEntities/JukeboxEntity.h | 2 | ||||
-rw-r--r-- | source/BlockEntities/SignEntity.cpp | 2 |
8 files changed, 8 insertions, 9 deletions
diff --git a/source/BlockEntities/ChestEntity.cpp b/source/BlockEntities/ChestEntity.cpp index d5cd076be..59193829d 100644 --- a/source/BlockEntities/ChestEntity.cpp +++ b/source/BlockEntities/ChestEntity.cpp @@ -3,9 +3,8 @@ #include "ChestEntity.h" #include "../Item.h" -#include "../Player.h" +#include "../Entities/Player.h" #include "../UI/Window.h" -#include "../Noise.h" #include <json/json.h> diff --git a/source/BlockEntities/DispenserEntity.cpp b/source/BlockEntities/DispenserEntity.cpp index f2c542c37..7edaa8a14 100644 --- a/source/BlockEntities/DispenserEntity.cpp +++ b/source/BlockEntities/DispenserEntity.cpp @@ -2,7 +2,7 @@ #include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules #include "DispenserEntity.h" -#include "../Player.h" +#include "../Entities/Player.h" #include "../Simulator/FluidSimulator.h" #include "../Chunk.h" diff --git a/source/BlockEntities/DropSpenserEntity.cpp b/source/BlockEntities/DropSpenserEntity.cpp index eb8257a21..a9fcdab17 100644 --- a/source/BlockEntities/DropSpenserEntity.cpp +++ b/source/BlockEntities/DropSpenserEntity.cpp @@ -6,7 +6,7 @@ #include "Globals.h" #include "DropSpenserEntity.h" -#include "../Player.h" +#include "../Entities/Player.h" #include "../Chunk.h" diff --git a/source/BlockEntities/DropperEntity.cpp b/source/BlockEntities/DropperEntity.cpp index 44d679e02..61127cec1 100644 --- a/source/BlockEntities/DropperEntity.cpp +++ b/source/BlockEntities/DropperEntity.cpp @@ -5,7 +5,7 @@ #include "Globals.h" #include "DropperEntity.h" -#include "../Player.h" +#include "../Entities/Player.h" #include "../Simulator/FluidSimulator.h" diff --git a/source/BlockEntities/FurnaceEntity.cpp b/source/BlockEntities/FurnaceEntity.cpp index 6cac8573d..2f548d003 100644 --- a/source/BlockEntities/FurnaceEntity.cpp +++ b/source/BlockEntities/FurnaceEntity.cpp @@ -3,7 +3,7 @@ #include "FurnaceEntity.h" #include "../UI/Window.h" -#include "../Player.h" +#include "../Entities/Player.h" #include "../Root.h" #include "../Chunk.h" #include <json/json.h> diff --git a/source/BlockEntities/HopperEntity.cpp b/source/BlockEntities/HopperEntity.cpp index 6fdff0e70..c3d7ed3ba 100644 --- a/source/BlockEntities/HopperEntity.cpp +++ b/source/BlockEntities/HopperEntity.cpp @@ -6,7 +6,7 @@ #include "Globals.h" #include "HopperEntity.h" #include "../Chunk.h" -#include "../Player.h" +#include "../Entities/Player.h" #include "../PluginManager.h" #include "ChestEntity.h" #include "DropSpenserEntity.h" diff --git a/source/BlockEntities/JukeboxEntity.h b/source/BlockEntities/JukeboxEntity.h index 74d40ecef..38574c945 100644 --- a/source/BlockEntities/JukeboxEntity.h +++ b/source/BlockEntities/JukeboxEntity.h @@ -2,7 +2,7 @@ #pragma once #include "BlockEntity.h" -#include "../Player.h" +#include "../Entities/Player.h" diff --git a/source/BlockEntities/SignEntity.cpp b/source/BlockEntities/SignEntity.cpp index 91cbb5a5e..2c160e603 100644 --- a/source/BlockEntities/SignEntity.cpp +++ b/source/BlockEntities/SignEntity.cpp @@ -3,7 +3,7 @@ #include "SignEntity.h" -#include "../Player.h" +#include "../Entities/Player.h" // #include "ClientHandle.h" // #include "World.h" // #include "Root.h" |