diff options
| author | daniel0916 <theschokolps@gmail.com> | 2014-04-07 20:12:17 +0200 |
|---|---|---|
| committer | daniel0916 <theschokolps@gmail.com> | 2014-04-07 20:12:17 +0200 |
| commit | 2e9754ac1cf0537c12ab7974cf55c451c0724540 (patch) | |
| tree | 713c5b8c8f22f77893b30b9c8cefca4a7c491483 /src/BlockEntities/HopperEntity.h | |
| parent | Fixed merge conflict (diff) | |
| parent | Fixed some more minor issues with the redstone simulator. (diff) | |
| download | cuberite-2e9754ac1cf0537c12ab7974cf55c451c0724540.tar cuberite-2e9754ac1cf0537c12ab7974cf55c451c0724540.tar.gz cuberite-2e9754ac1cf0537c12ab7974cf55c451c0724540.tar.bz2 cuberite-2e9754ac1cf0537c12ab7974cf55c451c0724540.tar.lz cuberite-2e9754ac1cf0537c12ab7974cf55c451c0724540.tar.xz cuberite-2e9754ac1cf0537c12ab7974cf55c451c0724540.tar.zst cuberite-2e9754ac1cf0537c12ab7974cf55c451c0724540.zip | |
Diffstat (limited to 'src/BlockEntities/HopperEntity.h')
| -rw-r--r-- | src/BlockEntities/HopperEntity.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/BlockEntities/HopperEntity.h b/src/BlockEntities/HopperEntity.h index 2c8b301fe..6ef98f43a 100644 --- a/src/BlockEntities/HopperEntity.h +++ b/src/BlockEntities/HopperEntity.h @@ -10,7 +10,6 @@ #pragma once #include "BlockEntityWithItems.h" -#include "../UI/WindowOwner.h" @@ -18,8 +17,7 @@ // tolua_begin class cHopperEntity : - public cBlockEntityWithItems, - public cBlockEntityWindowOwner + public cBlockEntityWithItems { typedef cBlockEntityWithItems super; |