summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authormohe2015 <mohe2015@users.noreply.github.com>2016-10-20 19:09:18 +0200
committerMattes D <github@xoft.cz>2016-10-20 19:09:18 +0200
commit502b5ec73222efaadd5ca6dc3e2011b740162b29 (patch)
treec2c7f0124fd602234a3a4dec0c81ab5171e7b4a1 /src
parentAPIDump: Added missing syntax to cUrlClient (#3407) (diff)
downloadcuberite-502b5ec73222efaadd5ca6dc3e2011b740162b29.tar
cuberite-502b5ec73222efaadd5ca6dc3e2011b740162b29.tar.gz
cuberite-502b5ec73222efaadd5ca6dc3e2011b740162b29.tar.bz2
cuberite-502b5ec73222efaadd5ca6dc3e2011b740162b29.tar.lz
cuberite-502b5ec73222efaadd5ca6dc3e2011b740162b29.tar.xz
cuberite-502b5ec73222efaadd5ca6dc3e2011b740162b29.tar.zst
cuberite-502b5ec73222efaadd5ca6dc3e2011b740162b29.zip
Diffstat (limited to 'src')
-rw-r--r--src/Blocks/BlockPiston.cpp3
-rwxr-xr-xsrc/CheckBasicStyle.lua4
2 files changed, 6 insertions, 1 deletions
diff --git a/src/Blocks/BlockPiston.cpp b/src/Blocks/BlockPiston.cpp
index 3bed01cc1..a6f247150 100644
--- a/src/Blocks/BlockPiston.cpp
+++ b/src/Blocks/BlockPiston.cpp
@@ -133,7 +133,8 @@ void cBlockPistonHandler::PushBlocks(
moveBlockPos.x, moveBlockPos.y, moveBlockPos.z
);
}
- } else
+ }
+ else
{
// Not breakable, just move it
a_World->SetBlock(moveBlockPos.x, moveBlockPos.y, moveBlockPos.z, moveBlock, moveMeta);
diff --git a/src/CheckBasicStyle.lua b/src/CheckBasicStyle.lua
index 8d188bb67..6cd499fd1 100755
--- a/src/CheckBasicStyle.lua
+++ b/src/CheckBasicStyle.lua
@@ -203,6 +203,10 @@ local g_ViolationPatterns =
-- We don't like "Type const *" and "Type const &". Use "const Type *" and "const Type &" instead:
{"const %&", "Use 'const Type &' instead of 'Type const &'"},
{"const %*", "Use 'const Type *' instead of 'Type const *'"},
+
+ -- Check if "else" is on the same line as a brace.
+ {"}%s*else", "else has to be on a separate line"},
+ {"else%s*{", "else has to be on a separate line"},
}