Skip to content

Commit d9cdd56

Browse files
fluffyloafiefluffyloafie
committed
Fix most of clang-format errors
- Fixed by hand, some might still be missing
1 parent 96f2ca4 commit d9cdd56

File tree

2 files changed

+24
-22
lines changed

2 files changed

+24
-22
lines changed

‎cubic-server/generation/player_constructions/NetherPortal.cpp‎

Lines changed: 21 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ void NetherPortal::setIgnitedBlock()
3737
(blocksArray[2] == Blocks::Obsidian::toProtocol() && blocksArray[3] != Blocks::Obsidian::toProtocol())) {
3838
_ignitedBlock = PortalIgnition::PORTAL_TOP_LEFT_CORNER;
3939
return;
40-
} else if ((blocksArray[1] == Blocks::Obsidian::toProtocol() && blocksArray[0] != Blocks::Obsidian::toProtocol()) ||
41-
(blocksArray[3] == Blocks::Obsidian::toProtocol() && blocksArray[2] != Blocks::Obsidian::toProtocol())) {
40+
} else if ((blocksArray[1] == Blocks::Obsidian::toProtocol() && blocksArray[0] != Blocks::Obsidian::toProtocol()) || (blocksArray[3] == Blocks::Obsidian::toProtocol() &&
41+
blocksArray[2] != Blocks::Obsidian::toProtocol())) {
4242
_ignitedBlock = PortalIgnition::PORTAL_TOP_RIGHT_CORNER;
4343
return;
4444
} else {
@@ -50,8 +50,8 @@ void NetherPortal::setIgnitedBlock()
5050
(blocksArray[2] == Blocks::Obsidian::toProtocol() && blocksArray[3] != Blocks::Obsidian::toProtocol())) {
5151
_ignitedBlock = PortalIgnition::PORTAL_BOTTOM_LEFT_CORNER;
5252
return;
53-
} else if ((blocksArray[1] == Blocks::Obsidian::toProtocol() && blocksArray[0] != Blocks::Obsidian::toProtocol()) ||
54-
(blocksArray[3] == Blocks::Obsidian::toProtocol() && blocksArray[2] != Blocks::Obsidian::toProtocol())) {
53+
} else if ((blocksArray[1] == Blocks::Obsidian::toProtocol() && blocksArray[0] != Blocks::Obsidian::toProtocol()) ||(blocksArray[3] == Blocks::Obsidian::toProtocol() &&
54+
blocksArray[2] != Blocks::Obsidian::toProtocol())) {
5555
_ignitedBlock = PortalIgnition::PORTAL_BOTTOM_RIGHT_CORNER;
5656
return;
5757
} else {
@@ -63,8 +63,8 @@ void NetherPortal::setIgnitedBlock()
6363
(blocksArray[2] == Blocks::Obsidian::toProtocol() && blocksArray[3] != Blocks::Obsidian::toProtocol())) {
6464
_ignitedBlock = PortalIgnition::PORTAL_LEFT_CENTER;
6565
return;
66-
} else if ((blocksArray[1] == Blocks::Obsidian::toProtocol() && blocksArray[0] != Blocks::Obsidian::toProtocol()) ||
67-
(blocksArray[3] == Blocks::Obsidian::toProtocol() && blocksArray[2] != Blocks::Obsidian::toProtocol())) {
66+
} else if ((blocksArray[1] == Blocks::Obsidian::toProtocol() && blocksArray[0] != Blocks::Obsidian::toProtocol()) || (blocksArray[3] == Blocks::Obsidian::toProtocol() &&
67+
blocksArray[2] != Blocks::Obsidian::toProtocol())) {
6868
_ignitedBlock = PortalIgnition::PORTAL_RIGHT_CENTER;
6969
return;
7070
} else {
@@ -111,7 +111,7 @@ void NetherPortal::setBottomLeftCorner()
111111
_direction = PortalDirection::PORTAL_X_AXIS;
112112
return;
113113
} else if (_dim->getBlock({_pos.x, _pos.y - countY, _pos.z}) == Blocks::Obsidian::toProtocol() &&
114-
_dim->getBlock({_pos.x, _pos.y, _pos.z - count}) == Blocks::Obsidian::toProtocol() && count > 1) {
114+
_dim->getBlock({_pos.x, _pos.y, _pos.z - count}) == Blocks::Obsidian::toProtocol() && count > 1) {
115115
_bottomLeftCorner = {_pos.x, _pos.y - countY, _pos.z - count};
116116
_direction = PortalDirection::PORTAL_Z_AXIS;
117117
return;
@@ -132,13 +132,13 @@ void NetherPortal::setDirection()
132132
if (_dim->getBlock({_bottomLeftCorner.x - 1, _bottomLeftCorner.y + 1, _bottomLeftCorner.z}) == Blocks::Obsidian::toProtocol() &&
133133
_dim->getBlock({_bottomLeftCorner.x + 1, _bottomLeftCorner.y, _bottomLeftCorner.z}) == Blocks::Obsidian::toProtocol() &&
134134
(_dim->getBlock({_bottomLeftCorner.x + 2, _bottomLeftCorner.y, _bottomLeftCorner.z}) == Blocks::Obsidian::toProtocol() ||
135-
_dim->getBlock({_bottomLeftCorner.x + 2, _bottomLeftCorner.y + 1, _bottomLeftCorner.z}) == Blocks::Obsidian::toProtocol())) {
135+
_dim->getBlock({_bottomLeftCorner.x + 2, _bottomLeftCorner.y + 1, _bottomLeftCorner.z}) == Blocks::Obsidian::toProtocol())) {
136136
_direction = PortalDirection::PORTAL_X_AXIS;
137137
return;
138138
} else if (_dim->getBlock({_bottomLeftCorner.x, _bottomLeftCorner.y + 1, _bottomLeftCorner.z - 1}) == Blocks::Obsidian::toProtocol() &&
139-
_dim->getBlock({_bottomLeftCorner.x, _bottomLeftCorner.y, _bottomLeftCorner.z + 1}) == Blocks::Obsidian::toProtocol() &&
140-
(_dim->getBlock({_bottomLeftCorner.x, _bottomLeftCorner.y, _bottomLeftCorner.z + 2}) == Blocks::Obsidian::toProtocol() ||
141-
_dim->getBlock({_bottomLeftCorner.x, _bottomLeftCorner.y + 1, _bottomLeftCorner.z + 2}) == Blocks::Obsidian::toProtocol())) {
139+
_dim->getBlock({_bottomLeftCorner.x, _bottomLeftCorner.y, _bottomLeftCorner.z + 1}) == Blocks::Obsidian::toProtocol() &&
140+
(_dim->getBlock({_bottomLeftCorner.x, _bottomLeftCorner.y, _bottomLeftCorner.z + 2}) == Blocks::Obsidian::toProtocol() ||
141+
_dim->getBlock({_bottomLeftCorner.x, _bottomLeftCorner.y + 1, _bottomLeftCorner.z + 2}) == Blocks::Obsidian::toProtocol())) {
142142
_direction = PortalDirection::PORTAL_Z_AXIS;
143143
return;
144144
}
@@ -204,10 +204,11 @@ void NetherPortal::openPortal()
204204
}
205205
for (auto [position, id] : blocksArray) {
206206
if (id != Blocks::Air::toProtocol() &&
207-
id != Blocks::Fire::toProtocol(
208-
Blocks::Fire::Properties::Age::ZERO, Blocks::Fire::Properties::East::FALSE, Blocks::Fire::Properties::North::FALSE,
209-
Blocks::Fire::Properties::South::FALSE, Blocks::Fire::Properties::Up::FALSE, Blocks::Fire::Properties::West::FALSE
210-
)) {
207+
id !=
208+
Blocks::Fire::toProtocol(
209+
Blocks::Fire::Properties::Age::ZERO, Blocks::Fire::Properties::East::FALSE, Blocks::Fire::Properties::North::FALSE, Blocks::Fire::Properties::South::FALSE,
210+
Blocks::Fire::Properties::Up::FALSE, Blocks::Fire::Properties::West::FALSE
211+
)) {
211212
LDEBUG("Obstruction within the frame at position {}: PORTAL_BAD_PORTAL ({})", position, PortalError::PORTAL_BAD_PORTAL);
212213
return;
213214
} else {
@@ -227,10 +228,11 @@ void NetherPortal::openPortal()
227228
}
228229
for (auto [position, id] : blocksArray) {
229230
if (id != Blocks::Air::toProtocol() &&
230-
id != Blocks::Fire::toProtocol(
231-
Blocks::Fire::Properties::Age::ZERO, Blocks::Fire::Properties::East::FALSE, Blocks::Fire::Properties::North::FALSE,
232-
Blocks::Fire::Properties::South::FALSE, Blocks::Fire::Properties::Up::FALSE, Blocks::Fire::Properties::West::FALSE
233-
)) {
231+
id !=
232+
Blocks::Fire::toProtocol(
233+
Blocks::Fire::Properties::Age::ZERO, Blocks::Fire::Properties::East::FALSE, Blocks::Fire::Properties::North::FALSE, Blocks::Fire::Properties::South::FALSE,
234+
Blocks::Fire::Properties::Up::FALSE, Blocks::Fire::Properties::West::FALSE
235+
)) {
234236
LDEBUG("Obstruction within the frame at position {}: PORTAL_BAD_PORTAL ({})", position, PortalError::PORTAL_BAD_PORTAL);
235237
return;
236238
} else {

‎cubic-server/generation/player_constructions/NetherPortal.hpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
#ifndef CUBICSERVER_GENERATION_PLAYER_CONSTRUCTIONS_NETHER_PORTAL_HPP
22
#define CUBICSERVER_GENERATION_PLAYER_CONSTRUCTIONS_NETHER_PORTAL_HPP
33

4-
#include "math/Vector2.hpp"
54
#include "blocks.hpp"
65
#include "generation/generator.hpp"
6+
#include "math/Vector2.hpp"
77
#include "types.hpp"
88
#include "world_storage/ChunkColumn.hpp"
99

@@ -78,7 +78,7 @@ class NetherPortal {
7878
_pos(pos)
7979
{
8080
setIgnitedBlock();
81-
setLeftCornerPosition();
81+
setBottomLeftCorner();
8282
setDirection();
8383
setSize();
8484
}
@@ -89,7 +89,7 @@ class NetherPortal {
8989
*
9090
*/
9191
void setIgnitedBlock();
92-
92+
9393
/**
9494
* @brief Sets _bottomLeftCorner to the position of the leftmost obsidian block on the bottom side of the portal, from the inner part of the portal
9595
* (the corner block, if obsidian, isn't taken into account)

0 commit comments

Comments
 (0)