From 0bffa2935854d1b1d0110a33707650cafe084af7 Mon Sep 17 00:00:00 2001
From: Mattes D <github@xoft.cz>
Date: Fri, 18 Nov 2016 20:00:04 +0100
Subject: Removed ClientHandle.h dependencies from common headers.

---
 src/BlockEntities/BeaconEntity.cpp     | 13 +++++++------
 src/BlockEntities/EnderChestEntity.cpp |  1 +
 src/BlockEntities/FlowerPotEntity.cpp  |  1 +
 src/BlockEntities/MobHeadEntity.cpp    |  2 ++
 src/BlockEntities/MobSpawnerEntity.cpp |  1 +
 5 files changed, 12 insertions(+), 6 deletions(-)

(limited to 'src/BlockEntities')

diff --git a/src/BlockEntities/BeaconEntity.cpp b/src/BlockEntities/BeaconEntity.cpp
index 6eb42384d..f2b38ac50 100644
--- a/src/BlockEntities/BeaconEntity.cpp
+++ b/src/BlockEntities/BeaconEntity.cpp
@@ -5,17 +5,18 @@
 #include "../BlockArea.h"
 #include "../Entities/Player.h"
 #include "../UI/BeaconWindow.h"
+#include "../ClientHandle.h"
 
 
 
 
 
-cBeaconEntity::cBeaconEntity(int a_BlockX, int a_BlockY, int a_BlockZ, cWorld * a_World)
-	: super(E_BLOCK_BEACON, a_BlockX, a_BlockY, a_BlockZ, 1, 1, a_World)
-	, m_IsActive(false)
-	, m_BeaconLevel(0)
-	, m_PrimaryEffect(cEntityEffect::effNoEffect)
-	, m_SecondaryEffect(cEntityEffect::effNoEffect)
+cBeaconEntity::cBeaconEntity(int a_BlockX, int a_BlockY, int a_BlockZ, cWorld * a_World):
+	super(E_BLOCK_BEACON, a_BlockX, a_BlockY, a_BlockZ, 1, 1, a_World),
+	m_IsActive(false),
+	m_BeaconLevel(0),
+	m_PrimaryEffect(cEntityEffect::effNoEffect),
+	m_SecondaryEffect(cEntityEffect::effNoEffect)
 {
 	UpdateBeacon();
 }
diff --git a/src/BlockEntities/EnderChestEntity.cpp b/src/BlockEntities/EnderChestEntity.cpp
index 74ca8d8ad..46d5912c3 100644
--- a/src/BlockEntities/EnderChestEntity.cpp
+++ b/src/BlockEntities/EnderChestEntity.cpp
@@ -2,6 +2,7 @@
 #include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
 
 #include "EnderChestEntity.h"
+#include "json/json.h"
 #include "../Item.h"
 #include "../Entities/Player.h"
 #include "../UI/EnderChestWindow.h"
diff --git a/src/BlockEntities/FlowerPotEntity.cpp b/src/BlockEntities/FlowerPotEntity.cpp
index 30c7c0745..125b0d173 100644
--- a/src/BlockEntities/FlowerPotEntity.cpp
+++ b/src/BlockEntities/FlowerPotEntity.cpp
@@ -6,6 +6,7 @@
 #include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
 #include "FlowerPotEntity.h"
 #include "../Entities/Player.h"
+#include "../ClientHandle.h"
 #include "../Item.h"
 
 
diff --git a/src/BlockEntities/MobHeadEntity.cpp b/src/BlockEntities/MobHeadEntity.cpp
index 542e920ba..068cc3ddf 100644
--- a/src/BlockEntities/MobHeadEntity.cpp
+++ b/src/BlockEntities/MobHeadEntity.cpp
@@ -5,7 +5,9 @@
 
 #include "Globals.h"
 #include "MobHeadEntity.h"
+#include "json/json.h"
 #include "../Entities/Player.h"
+#include "../ClientHandle.h"
 
 
 
diff --git a/src/BlockEntities/MobSpawnerEntity.cpp b/src/BlockEntities/MobSpawnerEntity.cpp
index 7f1b88c9b..47bf85e9b 100644
--- a/src/BlockEntities/MobSpawnerEntity.cpp
+++ b/src/BlockEntities/MobSpawnerEntity.cpp
@@ -6,6 +6,7 @@
 #include "../World.h"
 #include "../FastRandom.h"
 #include "../MobSpawner.h"
+#include "../ClientHandle.h"
 #include "../Items/ItemSpawnEgg.h"
 
 
-- 
cgit v1.2.3