flewkey
/
cuberite-2a
1
0
Fork 0
Code Releases Activity

Style fixes.

This commit is contained in:
madmaxoft 2014-09-29 21:38:11 +02:00
parent 30b083ed63
commit aae90c2cf0
3 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/Blocks/BlockTorch.h
View File

@ -121,12 +121,14 @@ public:
// If on a block that can only hold a torch if torch is standing on it, return that face
if (
((BlockInQuestion == E_BLOCK_GLASS) ||
(BlockInQuestion == E_BLOCK_FENCE) ||
(BlockInQuestion == E_BLOCK_NETHER_BRICK_FENCE) ||
(BlockInQuestion == E_BLOCK_COBBLESTONE_WALL) ||
(BlockInQuestion == E_BLOCK_STONE_SLAB) ||
(BlockInQuestion == E_BLOCK_WOODEN_SLAB)) &&
(
(BlockInQuestion == E_BLOCK_GLASS) ||
(BlockInQuestion == E_BLOCK_FENCE) ||
(BlockInQuestion == E_BLOCK_NETHER_BRICK_FENCE) ||
(BlockInQuestion == E_BLOCK_COBBLESTONE_WALL) ||
(BlockInQuestion == E_BLOCK_STONE_SLAB) ||
(BlockInQuestion == E_BLOCK_WOODEN_SLAB)
) &&
(Face == BLOCK_FACE_TOP)
)
{

6
src/Protocol/ProtocolRecognizer.cpp
View File

@ -201,9 +201,9 @@ void cProtocolRecognizer::SendDisconnect(const AString & a_Reason)
SendData((const char *)&Packet, 1); // WriteByte()
AString UTF16 = UTF8ToRawBEUTF16(a_Reason.c_str(), a_Reason.length());
static const short Size = htons((short)(UTF16.size() / 2));
SendData((const char *)&Size, 2); // WriteShort()
SendData(UTF16.data(), UTF16.size()); // WriteString()
static const u_short Size = htons((u_short)(UTF16.size() / 2));
SendData((const char *)&Size, 2); // WriteShort()
SendData(UTF16.data(), UTF16.size()); // WriteString()
}
}

3
src/RankManager.cpp
View File

@ -1822,7 +1822,8 @@ void cRankManager::ClearPlayerRanks(void)
ASSERT(m_IsInitialized);
cCSLock Lock(m_CS);
try {
try
{
SQLite::Statement stmt(m_DB, "DELETE FROM PlayerRank");
stmt.exec();
}