summaryrefslogtreecommitdiffstats
path: root/src/Items
diff options
context:
space:
mode:
authorLukas Pioch <lukas@zgow.de>2017-08-06 21:57:44 +0200
committerworktycho <work.tycho@gmail.com>2017-08-06 21:57:44 +0200
commit07f25253a2190abfb10a27e25a72eb052421992f (patch)
tree0743d0f2f270100642dba35ed0b98add3b2d1c5a /src/Items
parentFixed compilation for clang 4.0 & gcc 7.1 (diff)
downloadcuberite-07f25253a2190abfb10a27e25a72eb052421992f.tar
cuberite-07f25253a2190abfb10a27e25a72eb052421992f.tar.gz
cuberite-07f25253a2190abfb10a27e25a72eb052421992f.tar.bz2
cuberite-07f25253a2190abfb10a27e25a72eb052421992f.tar.lz
cuberite-07f25253a2190abfb10a27e25a72eb052421992f.tar.xz
cuberite-07f25253a2190abfb10a27e25a72eb052421992f.tar.zst
cuberite-07f25253a2190abfb10a27e25a72eb052421992f.zip
Diffstat (limited to '')
-rw-r--r--src/Items/ItemAxe.h2
-rw-r--r--src/Items/ItemBucket.h1
-rw-r--r--src/Items/ItemEmptyMap.h1
-rw-r--r--src/Items/ItemFishingRod.h1
-rw-r--r--src/Items/ItemHandler.h1
-rw-r--r--src/Items/ItemLighter.h1
-rw-r--r--src/Items/ItemMap.h1
-rw-r--r--src/Items/ItemPickaxe.h4
-rw-r--r--src/Items/ItemPotion.h2
-rw-r--r--src/Items/ItemShovel.h2
-rw-r--r--src/Items/ItemSlab.h1
-rw-r--r--src/Items/ItemSword.h2
12 files changed, 4 insertions, 15 deletions
diff --git a/src/Items/ItemAxe.h b/src/Items/ItemAxe.h
index 656497199..1f9c44f1e 100644
--- a/src/Items/ItemAxe.h
+++ b/src/Items/ItemAxe.h
@@ -2,8 +2,6 @@
#pragma once
#include "ItemHandler.h"
-#include "../World.h"
-#include "../Entities/Player.h"
diff --git a/src/Items/ItemBucket.h b/src/Items/ItemBucket.h
index 18b7bb46f..2c93c3856 100644
--- a/src/Items/ItemBucket.h
+++ b/src/Items/ItemBucket.h
@@ -6,7 +6,6 @@
#include "../Simulator/FluidSimulator.h"
#include "../Blocks/BlockHandler.h"
#include "../LineBlockTracer.h"
-#include "../BlockInServerPluginInterface.h"
#include "../Blocks/ChunkInterface.h"
diff --git a/src/Items/ItemEmptyMap.h b/src/Items/ItemEmptyMap.h
index 78d037313..3d77250fa 100644
--- a/src/Items/ItemEmptyMap.h
+++ b/src/Items/ItemEmptyMap.h
@@ -7,7 +7,6 @@
#pragma once
-#include "../Entities/Entity.h"
#include "../Item.h"
diff --git a/src/Items/ItemFishingRod.h b/src/Items/ItemFishingRod.h
index 2becc16b0..a32368304 100644
--- a/src/Items/ItemFishingRod.h
+++ b/src/Items/ItemFishingRod.h
@@ -9,7 +9,6 @@
#pragma once
-#include "../Bindings/PluginManager.h"
#include "../Entities/Floater.h"
#include "../Entities/Entity.h"
#include "../Item.h"
diff --git a/src/Items/ItemHandler.h b/src/Items/ItemHandler.h
index 9689ec50d..48cf782d8 100644
--- a/src/Items/ItemHandler.h
+++ b/src/Items/ItemHandler.h
@@ -3,7 +3,6 @@
#include "../Defines.h"
#include "../Item.h"
-#include "../Entities/EntityEffect.h"
#include "../Blocks/BlockPluginInterface.h"
diff --git a/src/Items/ItemLighter.h b/src/Items/ItemLighter.h
index 72e358297..1cf2ec939 100644
--- a/src/Items/ItemLighter.h
+++ b/src/Items/ItemLighter.h
@@ -4,7 +4,6 @@
#include "ItemHandler.h"
#include "../World.h"
#include "../Entities/Player.h"
-#include "../Entities/TNTEntity.h"
diff --git a/src/Items/ItemMap.h b/src/Items/ItemMap.h
index afce4ba01..57ede063c 100644
--- a/src/Items/ItemMap.h
+++ b/src/Items/ItemMap.h
@@ -7,7 +7,6 @@
#pragma once
-#include "../Entities/Entity.h"
#include "../Item.h"
diff --git a/src/Items/ItemPickaxe.h b/src/Items/ItemPickaxe.h
index 5c460421d..66796012b 100644
--- a/src/Items/ItemPickaxe.h
+++ b/src/Items/ItemPickaxe.h
@@ -2,8 +2,8 @@
#pragma once
#include "ItemHandler.h"
-#include "../World.h"
-#include "../Entities/Player.h"
+
+
class cItemPickaxeHandler :
public cItemHandler
diff --git a/src/Items/ItemPotion.h b/src/Items/ItemPotion.h
index 01c011fa3..dfc8aa033 100644
--- a/src/Items/ItemPotion.h
+++ b/src/Items/ItemPotion.h
@@ -2,7 +2,7 @@
#pragma once
#include "../Entities/EntityEffect.h"
-#include "../Entities/SplashPotionEntity.h"
+
class cItemPotionHandler:
public cItemHandler
diff --git a/src/Items/ItemShovel.h b/src/Items/ItemShovel.h
index b26522b33..a3ef97684 100644
--- a/src/Items/ItemShovel.h
+++ b/src/Items/ItemShovel.h
@@ -5,7 +5,7 @@
#include "../World.h"
#include "../Entities/Player.h"
-#include "../Blocks/BlockHandler.h"
+
#include "../BlockInServerPluginInterface.h"
diff --git a/src/Items/ItemSlab.h b/src/Items/ItemSlab.h
index 7741f5f30..05bd60423 100644
--- a/src/Items/ItemSlab.h
+++ b/src/Items/ItemSlab.h
@@ -10,7 +10,6 @@
#pragma once
#include "ItemHandler.h"
-#include "../Blocks/BlockSlab.h"
diff --git a/src/Items/ItemSword.h b/src/Items/ItemSword.h
index 46c88b49d..5730691cf 100644
--- a/src/Items/ItemSword.h
+++ b/src/Items/ItemSword.h
@@ -2,8 +2,6 @@
#pragma once
#include "ItemHandler.h"
-#include "../World.h"
-#include "../Entities/Player.h"