summaryrefslogtreecommitdiffstats
path: root/src/Blocks
diff options
context:
space:
mode:
authorAlexander Harkness <me@bearbin.net>2020-04-09 23:59:56 +0200
committerAlexander Harkness <me@bearbin.net>2020-04-10 15:07:16 +0200
commitdb118af6ae6f55579aef2387e6fae9fe4b068260 (patch)
tree800e9a82c2808a5a02bbd2e8ceaea7935aa50d38 /src/Blocks
parentReduce line length on templates (diff)
downloadcuberite-db118af6ae6f55579aef2387e6fae9fe4b068260.tar
cuberite-db118af6ae6f55579aef2387e6fae9fe4b068260.tar.gz
cuberite-db118af6ae6f55579aef2387e6fae9fe4b068260.tar.bz2
cuberite-db118af6ae6f55579aef2387e6fae9fe4b068260.tar.lz
cuberite-db118af6ae6f55579aef2387e6fae9fe4b068260.tar.xz
cuberite-db118af6ae6f55579aef2387e6fae9fe4b068260.tar.zst
cuberite-db118af6ae6f55579aef2387e6fae9fe4b068260.zip
Diffstat (limited to 'src/Blocks')
-rw-r--r--src/Blocks/BlockGlazedTerracotta.h19
-rw-r--r--src/Blocks/BlockHandler.cpp7
-rw-r--r--src/Blocks/CMakeLists.txt1
3 files changed, 6 insertions, 21 deletions
diff --git a/src/Blocks/BlockGlazedTerracotta.h b/src/Blocks/BlockGlazedTerracotta.h
deleted file mode 100644
index 44ebd7012..000000000
--- a/src/Blocks/BlockGlazedTerracotta.h
+++ /dev/null
@@ -1,19 +0,0 @@
-
-#pragma once
-
-#include "BlockHandler.h"
-#include "Mixins.h"
-
-
-class cBlockGlazedTerracottaHandler:
- public cClearMetaOnDrop<cYawRotator<cBlockHandler, 0x3, 0x1, 0x3, 0x0, 0x2>>
-{
- using super = cClearMetaOnDrop<cYawRotator<cBlockHandler, 0x3, 0x1, 0x3, 0x0, 0x2>>;
-
-public:
-
- cBlockGlazedTerracottaHandler(BLOCKTYPE a_BlockType) : super(a_BlockType)
- {
- }
-
-};
diff --git a/src/Blocks/BlockHandler.cpp b/src/Blocks/BlockHandler.cpp
index 0a6462348..f82118ec2 100644
--- a/src/Blocks/BlockHandler.cpp
+++ b/src/Blocks/BlockHandler.cpp
@@ -40,7 +40,6 @@
#include "BlockFluid.h"
#include "BlockFurnace.h"
#include "BlockGlass.h"
-#include "BlockGlazedTerracotta.h"
#include "BlockGlowstone.h"
#include "BlockGrass.h"
#include "BlockGravel.h"
@@ -98,6 +97,12 @@
+using cBlockGlazedTerracottaHandler = cClearMetaOnDrop<cYawRotator<cBlockHandler, 0x3, 0x1, 0x3, 0x0, 0x2>>;
+
+
+
+
+
/*
// Tests the meta rotation and mirroring.
// Note that the cMetaRotator needs to have its assert paths disabled for this test to work!
diff --git a/src/Blocks/CMakeLists.txt b/src/Blocks/CMakeLists.txt
index f67ae5270..ae451a3ad 100644
--- a/src/Blocks/CMakeLists.txt
+++ b/src/Blocks/CMakeLists.txt
@@ -46,7 +46,6 @@ SET (HDRS
BlockFluid.h
BlockFurnace.h
BlockGlass.h
- BlockGlazedTerracotta.h
BlockGlowstone.h
BlockGravel.h
BlockHandler.h