diff options
author | Lukas Pioch <lukas@zgow.de> | 2017-08-06 21:57:44 +0200 |
---|---|---|
committer | worktycho <work.tycho@gmail.com> | 2017-08-06 21:57:44 +0200 |
commit | 07f25253a2190abfb10a27e25a72eb052421992f (patch) | |
tree | 0743d0f2f270100642dba35ed0b98add3b2d1c5a /src/Blocks | |
parent | Fixed compilation for clang 4.0 & gcc 7.1 (diff) | |
download | cuberite-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 'src/Blocks')
-rw-r--r-- | src/Blocks/BlockAnvil.h | 1 | ||||
-rw-r--r-- | src/Blocks/BlockBed.h | 2 | ||||
-rw-r--r-- | src/Blocks/BlockBrewingStand.h | 1 | ||||
-rw-r--r-- | src/Blocks/BlockFlowerPot.h | 1 | ||||
-rw-r--r-- | src/Blocks/BlockFurnace.h | 1 | ||||
-rw-r--r-- | src/Blocks/BlockIce.h | 1 | ||||
-rw-r--r-- | src/Blocks/BlockLadder.h | 1 | ||||
-rw-r--r-- | src/Blocks/BlockLeaves.h | 1 | ||||
-rw-r--r-- | src/Blocks/BlockLilypad.h | 2 | ||||
-rw-r--r-- | src/Blocks/BlockMobSpawner.h | 1 | ||||
-rw-r--r-- | src/Blocks/BlockNetherWart.h | 1 | ||||
-rw-r--r-- | src/Blocks/BlockOre.h | 1 | ||||
-rw-r--r-- | src/Blocks/BlockPortal.h | 1 | ||||
-rw-r--r-- | src/Blocks/BlockRail.h | 2 | ||||
-rw-r--r-- | src/Blocks/BlockRedstone.h | 1 | ||||
-rw-r--r-- | src/Blocks/BlockRedstoneTorch.h | 1 | ||||
-rw-r--r-- | src/Blocks/BlockSapling.h | 1 | ||||
-rw-r--r-- | src/Blocks/BlockSignPost.h | 1 | ||||
-rw-r--r-- | src/Blocks/BlockSlab.h | 1 | ||||
-rw-r--r-- | src/Blocks/BlockStems.h | 1 | ||||
-rw-r--r-- | src/Blocks/BlockVine.h | 4 | ||||
-rw-r--r-- | src/Blocks/BlockWallSign.h | 1 |
22 files changed, 3 insertions, 25 deletions
diff --git a/src/Blocks/BlockAnvil.h b/src/Blocks/BlockAnvil.h index ef3894b50..5b1fea134 100644 --- a/src/Blocks/BlockAnvil.h +++ b/src/Blocks/BlockAnvil.h @@ -2,7 +2,6 @@ #pragma once #include "BlockHandler.h" -#include "../World.h" #include "../Entities/Player.h" #include "../UI/AnvilWindow.h" diff --git a/src/Blocks/BlockBed.h b/src/Blocks/BlockBed.h index 9500dae9b..634c7dd3a 100644 --- a/src/Blocks/BlockBed.h +++ b/src/Blocks/BlockBed.h @@ -4,10 +4,8 @@ #pragma once #include "BlockEntity.h" -#include "BlockHandler.h" #include "MetaRotator.h" #include "ChunkInterface.h" -#include "../World.h" #include "../Entities/Entity.h" diff --git a/src/Blocks/BlockBrewingStand.h b/src/Blocks/BlockBrewingStand.h index 0ab5c8eba..3445a0f5a 100644 --- a/src/Blocks/BlockBrewingStand.h +++ b/src/Blocks/BlockBrewingStand.h @@ -2,7 +2,6 @@ #pragma once #include "BlockEntity.h" -#include "BlockHandler.h" #include "MetaRotator.h" diff --git a/src/Blocks/BlockFlowerPot.h b/src/Blocks/BlockFlowerPot.h index cafe476d9..40bad534f 100644 --- a/src/Blocks/BlockFlowerPot.h +++ b/src/Blocks/BlockFlowerPot.h @@ -1,7 +1,6 @@ #pragma once -#include "BlockHandler.h" #include "BlockEntity.h" diff --git a/src/Blocks/BlockFurnace.h b/src/Blocks/BlockFurnace.h index 788001f0e..ea1779c41 100644 --- a/src/Blocks/BlockFurnace.h +++ b/src/Blocks/BlockFurnace.h @@ -2,7 +2,6 @@ #pragma once #include "BlockEntity.h" -#include "../World.h" #include "../Blocks/BlockPiston.h" #include "MetaRotator.h" diff --git a/src/Blocks/BlockIce.h b/src/Blocks/BlockIce.h index aa6751b60..b36b95f37 100644 --- a/src/Blocks/BlockIce.h +++ b/src/Blocks/BlockIce.h @@ -2,7 +2,6 @@ #pragma once #include "BlockHandler.h" -#include "../World.h" diff --git a/src/Blocks/BlockLadder.h b/src/Blocks/BlockLadder.h index ef6885f86..27fbed9af 100644 --- a/src/Blocks/BlockLadder.h +++ b/src/Blocks/BlockLadder.h @@ -2,7 +2,6 @@ #pragma once #include "BlockHandler.h" -#include "../World.h" #include "ClearMetaOnDrop.h" diff --git a/src/Blocks/BlockLeaves.h b/src/Blocks/BlockLeaves.h index 1f25ac49e..5cd147fb5 100644 --- a/src/Blocks/BlockLeaves.h +++ b/src/Blocks/BlockLeaves.h @@ -1,7 +1,6 @@ #pragma once #include "BlockHandler.h" #include "../FastRandom.h" -#include "../World.h" #include "../BlockArea.h" diff --git a/src/Blocks/BlockLilypad.h b/src/Blocks/BlockLilypad.h index 18a576017..398d2b64b 100644 --- a/src/Blocks/BlockLilypad.h +++ b/src/Blocks/BlockLilypad.h @@ -2,7 +2,7 @@ #pragma once #include "BlockHandler.h" -#include "Entities/Pickup.h" + diff --git a/src/Blocks/BlockMobSpawner.h b/src/Blocks/BlockMobSpawner.h index 1dcedd8a8..f36e2b6eb 100644 --- a/src/Blocks/BlockMobSpawner.h +++ b/src/Blocks/BlockMobSpawner.h @@ -2,7 +2,6 @@ #pragma once #include "BlockHandler.h" -#include "../World.h" #include "../Items/ItemHandler.h" diff --git a/src/Blocks/BlockNetherWart.h b/src/Blocks/BlockNetherWart.h index aa7144458..5732259db 100644 --- a/src/Blocks/BlockNetherWart.h +++ b/src/Blocks/BlockNetherWart.h @@ -3,7 +3,6 @@ #include "BlockPlant.h" #include "../FastRandom.h" -#include "../World.h" diff --git a/src/Blocks/BlockOre.h b/src/Blocks/BlockOre.h index 484338f40..0c72e39f9 100644 --- a/src/Blocks/BlockOre.h +++ b/src/Blocks/BlockOre.h @@ -2,7 +2,6 @@ #pragma once #include "BlockHandler.h" -#include "../World.h" diff --git a/src/Blocks/BlockPortal.h b/src/Blocks/BlockPortal.h index 9beb58199..6cebcbd37 100644 --- a/src/Blocks/BlockPortal.h +++ b/src/Blocks/BlockPortal.h @@ -2,7 +2,6 @@ #pragma once #include "BlockHandler.h" -#include "../Mobs/Monster.h" diff --git a/src/Blocks/BlockRail.h b/src/Blocks/BlockRail.h index 5d3c087e7..07483c9b3 100644 --- a/src/Blocks/BlockRail.h +++ b/src/Blocks/BlockRail.h @@ -1,8 +1,6 @@ #pragma once -#include "BlockEntity.h" - diff --git a/src/Blocks/BlockRedstone.h b/src/Blocks/BlockRedstone.h index 47c90bfd9..225f1cc75 100644 --- a/src/Blocks/BlockRedstone.h +++ b/src/Blocks/BlockRedstone.h @@ -2,7 +2,6 @@ #pragma once #include "BlockHandler.h" -#include "../World.h" #include "BlockSlab.h" diff --git a/src/Blocks/BlockRedstoneTorch.h b/src/Blocks/BlockRedstoneTorch.h index 21d005052..11a42bf9f 100644 --- a/src/Blocks/BlockRedstoneTorch.h +++ b/src/Blocks/BlockRedstoneTorch.h @@ -1,7 +1,6 @@ #pragma once -#include "BlockRedstone.h" #include "BlockTorch.h" diff --git a/src/Blocks/BlockSapling.h b/src/Blocks/BlockSapling.h index a356eda8f..4133c5b80 100644 --- a/src/Blocks/BlockSapling.h +++ b/src/Blocks/BlockSapling.h @@ -2,7 +2,6 @@ #pragma once #include "BlockHandler.h" -#include "../World.h" #include "../FastRandom.h" diff --git a/src/Blocks/BlockSignPost.h b/src/Blocks/BlockSignPost.h index 51e034081..4af50ad5b 100644 --- a/src/Blocks/BlockSignPost.h +++ b/src/Blocks/BlockSignPost.h @@ -2,7 +2,6 @@ #pragma once #include "BlockHandler.h" -#include "../Entities/Player.h" #include "Chunk.h" diff --git a/src/Blocks/BlockSlab.h b/src/Blocks/BlockSlab.h index 966aff4e2..a424ae073 100644 --- a/src/Blocks/BlockSlab.h +++ b/src/Blocks/BlockSlab.h @@ -10,7 +10,6 @@ #pragma once #include "BlockHandler.h" -#include "../Items/ItemHandler.h" #include "ChunkInterface.h" #include "../Entities/Player.h" diff --git a/src/Blocks/BlockStems.h b/src/Blocks/BlockStems.h index 388da5874..659df558f 100644 --- a/src/Blocks/BlockStems.h +++ b/src/Blocks/BlockStems.h @@ -2,7 +2,6 @@ #pragma once #include "BlockPlant.h" -#include "../World.h" diff --git a/src/Blocks/BlockVine.h b/src/Blocks/BlockVine.h index e15327743..21dba0bed 100644 --- a/src/Blocks/BlockVine.h +++ b/src/Blocks/BlockVine.h @@ -1,8 +1,8 @@ #pragma once #include "BlockHandler.h" -#include "MetaRotator.h" -#include "Bindings/PluginManager.h" + + diff --git a/src/Blocks/BlockWallSign.h b/src/Blocks/BlockWallSign.h index b69944609..7166f8ecd 100644 --- a/src/Blocks/BlockWallSign.h +++ b/src/Blocks/BlockWallSign.h @@ -2,7 +2,6 @@ #pragma once #include "BlockHandler.h" -#include "../Entities/Player.h" #include "Chunk.h" |