summaryrefslogtreecommitdiffstats
path: root/src/Entities/Entity.cpp
diff options
context:
space:
mode:
authorpeterbell10 <peterbell10@live.co.uk>2018-08-29 02:51:25 +0200
committerGitHub <noreply@github.com>2018-08-29 02:51:25 +0200
commitee8419701472be9f24c51a41ee7b7ef3cf38f329 (patch)
treeb689d4657ec4bb2de7e47f43f670e99b564f85a7 /src/Entities/Entity.cpp
parentStore and pass entity effect duration as an int not a short. (#4293) (diff)
downloadcuberite-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 '')
-rw-r--r--src/Entities/Entity.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/Entities/Entity.cpp b/src/Entities/Entity.cpp
index ac9aad92a..4c9900aa9 100644
--- a/src/Entities/Entity.cpp
+++ b/src/Entities/Entity.cpp
@@ -2,6 +2,7 @@
#include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules
#include "Entity.h"
+#include "Player.h"
#include "../World.h"
#include "../Root.h"
#include "../Matrix4.h"
@@ -10,8 +11,7 @@
#include "../Simulator/FluidSimulator.h"
#include "../Bindings/PluginManager.h"
#include "../LineBlockTracer.h"
-#include "Player.h"
-#include "Items/ItemHandler.h"
+#include "../Items/ItemHandler.h"
#include "../FastRandom.h"
#include "../NetherPortalScanner.h"
#include "../BoundingBox.h"