summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTycho <work.tycho+git@gmail.com>2014-03-14 15:12:00 +0100
committerTycho <work.tycho+git@gmail.com>2014-03-14 15:12:00 +0100
commitb829c9b14e95f37a3a5ba70fc42cb8cfe9066522 (patch)
tree392ccca5055febfca4b36d818b910f1c9b8181cc
parentRemoved missiterperatable malfunctioning error handling code (diff)
downloadcuberite-b829c9b14e95f37a3a5ba70fc42cb8cfe9066522.tar
cuberite-b829c9b14e95f37a3a5ba70fc42cb8cfe9066522.tar.gz
cuberite-b829c9b14e95f37a3a5ba70fc42cb8cfe9066522.tar.bz2
cuberite-b829c9b14e95f37a3a5ba70fc42cb8cfe9066522.tar.lz
cuberite-b829c9b14e95f37a3a5ba70fc42cb8cfe9066522.tar.xz
cuberite-b829c9b14e95f37a3a5ba70fc42cb8cfe9066522.tar.zst
cuberite-b829c9b14e95f37a3a5ba70fc42cb8cfe9066522.zip
Diffstat (limited to '')
-rw-r--r--src/Map.cpp4
-rw-r--r--src/StringUtils.cpp1
-rw-r--r--src/main.cpp1
3 files changed, 3 insertions, 3 deletions
diff --git a/src/Map.cpp b/src/Map.cpp
index 2d8f57168..79370b097 100644
--- a/src/Map.cpp
+++ b/src/Map.cpp
@@ -243,7 +243,7 @@ bool cMap::UpdatePixel(unsigned int a_X, unsigned int a_Z)
{
for (unsigned int Z = m_RelZ; Z < m_RelZ + PixelWidth; ++Z)
{
- unsigned int WaterDepth = 0;
+ // unsigned int WaterDepth = 0;
BLOCKTYPE TargetBlock = E_BLOCK_AIR;
NIBBLETYPE TargetMeta = 0;
@@ -261,12 +261,14 @@ bool cMap::UpdatePixel(unsigned int a_X, unsigned int a_Z)
continue;
}
// TODO 2014-02-22 xdot: Check if block is liquid
+ /*
else if (false)
{
--Height;
++WaterDepth;
continue;
}
+ */
break;
}
diff --git a/src/StringUtils.cpp b/src/StringUtils.cpp
index 3f9275798..ad622d707 100644
--- a/src/StringUtils.cpp
+++ b/src/StringUtils.cpp
@@ -454,7 +454,6 @@ AString & UTF8ToRawBEUTF16(const char * a_UTF8, size_t a_UTF8Length, AString & a
if (!isLegalUTF8(source, extraBytesToRead + 1))
{
return a_UTF16;
- break;
}
// The cases all fall through. See "Note A" below.
diff --git a/src/main.cpp b/src/main.cpp
index 2ae8a413b..68eea7f4d 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -72,7 +72,6 @@ void NonCtrlHandler(int a_Signal)
LOGERROR(" D: | MCServer has encountered an error and needs to close");
LOGERROR("Details | SIGABRT: Server self-terminated due to an internal fault");
exit(EXIT_FAILURE);
- break;
}
case SIGINT:
case SIGTERM: