summaryrefslogtreecommitdiffstats
path: root/source/Blocks
diff options
context:
space:
mode:
authormadmaxoft <github@xoft.cz>2013-08-19 11:39:13 +0200
committermadmaxoft <github@xoft.cz>2013-08-19 11:39:13 +0200
commit1a7912744ff2e0abfeae0d2d75af80d73209580c (patch)
treee5372cdfece1852c00ed7b0219ad77ee82ea1858 /source/Blocks
parentFixed timed event wait on Linux. (diff)
downloadcuberite-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/Blocks/BlockBed.h2
-rw-r--r--source/Blocks/BlockChest.h2
-rw-r--r--source/Blocks/BlockDoor.cpp2
-rw-r--r--source/Blocks/BlockDoor.h2
-rw-r--r--source/Blocks/BlockFurnace.h2
-rw-r--r--source/Blocks/BlockLever.cpp2
-rw-r--r--source/Blocks/BlockPiston.cpp2
-rw-r--r--source/Blocks/BlockRedstoneRepeater.cpp1
-rw-r--r--source/Blocks/BlockSign.h2
-rw-r--r--source/Blocks/BlockWorkbench.h2
10 files changed, 9 insertions, 10 deletions
diff --git a/source/Blocks/BlockBed.h b/source/Blocks/BlockBed.h
index 8286ceb11..0bf1cfc0f 100644
--- a/source/Blocks/BlockBed.h
+++ b/source/Blocks/BlockBed.h
@@ -3,7 +3,7 @@
#include "BlockHandler.h"
#include "../World.h"
-#include "../Player.h"
+#include "../Entities/Player.h"
diff --git a/source/Blocks/BlockChest.h b/source/Blocks/BlockChest.h
index 8164942a3..488c58ac5 100644
--- a/source/Blocks/BlockChest.h
+++ b/source/Blocks/BlockChest.h
@@ -4,7 +4,7 @@
#include "BlockEntity.h"
#include "../World.h"
#include "../BlockArea.h"
-#include "../Player.h"
+#include "../Entities/Player.h"
diff --git a/source/Blocks/BlockDoor.cpp b/source/Blocks/BlockDoor.cpp
index b2fe273c5..267486c47 100644
--- a/source/Blocks/BlockDoor.cpp
+++ b/source/Blocks/BlockDoor.cpp
@@ -4,7 +4,7 @@
#include "../Item.h"
#include "../World.h"
#include "../Doors.h"
-#include "../Player.h"
+#include "../Entities/Player.h"
diff --git a/source/Blocks/BlockDoor.h b/source/Blocks/BlockDoor.h
index 19701ffc9..4978fee38 100644
--- a/source/Blocks/BlockDoor.h
+++ b/source/Blocks/BlockDoor.h
@@ -4,7 +4,7 @@
#include "BlockHandler.h"
#include "../World.h"
#include "../Doors.h"
-#include "../Player.h"
+#include "../Entities/Player.h"
diff --git a/source/Blocks/BlockFurnace.h b/source/Blocks/BlockFurnace.h
index b358a1d71..fe35893d5 100644
--- a/source/Blocks/BlockFurnace.h
+++ b/source/Blocks/BlockFurnace.h
@@ -4,7 +4,7 @@
#include "BlockEntity.h"
#include "../World.h"
#include "../Piston.h"
-#include "../Player.h"
+#include "../Entities/Player.h"
diff --git a/source/Blocks/BlockLever.cpp b/source/Blocks/BlockLever.cpp
index 6dbff10c1..f2ca1805a 100644
--- a/source/Blocks/BlockLever.cpp
+++ b/source/Blocks/BlockLever.cpp
@@ -3,7 +3,7 @@
#include "BlockLever.h"
#include "../Item.h"
#include "../World.h"
-#include "../Player.h"
+#include "../Entities/Player.h"
#include "../Simulator/RedstoneSimulator.h"
diff --git a/source/Blocks/BlockPiston.cpp b/source/Blocks/BlockPiston.cpp
index 1bfac3ca1..d5750ebdd 100644
--- a/source/Blocks/BlockPiston.cpp
+++ b/source/Blocks/BlockPiston.cpp
@@ -3,7 +3,7 @@
#include "BlockPiston.h"
#include "../Item.h"
#include "../World.h"
-#include "../Player.h"
+#include "../Entities/Player.h"
#include "../Piston.h"
diff --git a/source/Blocks/BlockRedstoneRepeater.cpp b/source/Blocks/BlockRedstoneRepeater.cpp
index 9857dd223..3bc879435 100644
--- a/source/Blocks/BlockRedstoneRepeater.cpp
+++ b/source/Blocks/BlockRedstoneRepeater.cpp
@@ -3,7 +3,6 @@
#include "BlockRedstoneRepeater.h"
#include "../Item.h"
#include "../World.h"
-#include "../Player.h"
#include "../Simulator/RedstoneSimulator.h"
diff --git a/source/Blocks/BlockSign.h b/source/Blocks/BlockSign.h
index 09fa721b6..e6426180f 100644
--- a/source/Blocks/BlockSign.h
+++ b/source/Blocks/BlockSign.h
@@ -3,7 +3,7 @@
#include "BlockHandler.h"
#include "../World.h"
-#include "../Player.h"
+#include "../Entities/Player.h"
diff --git a/source/Blocks/BlockWorkbench.h b/source/Blocks/BlockWorkbench.h
index 60aa1791b..a2cc6119c 100644
--- a/source/Blocks/BlockWorkbench.h
+++ b/source/Blocks/BlockWorkbench.h
@@ -3,7 +3,7 @@
#include "BlockHandler.h"
#include "../UI/Window.h"
-#include "../Player.h"
+#include "../Entities/Player.h"