diff options
| author | peterbell10 <peterbell10@live.co.uk> | 2020-05-15 00:15:35 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-15 00:15:35 +0200 |
| commit | 13144a08e496b89b34093ffd3d810d3442df3c44 (patch) | |
| tree | 406d79e17b69560564fdb0972a3c50542a3a96c6 /src/ClientHandle.cpp | |
| parent | Generate "LuaState_Typedefs.inc" before running clang-tidy (diff) | |
| download | cuberite-13144a08e496b89b34093ffd3d810d3442df3c44.tar cuberite-13144a08e496b89b34093ffd3d810d3442df3c44.tar.gz cuberite-13144a08e496b89b34093ffd3d810d3442df3c44.tar.bz2 cuberite-13144a08e496b89b34093ffd3d810d3442df3c44.tar.lz cuberite-13144a08e496b89b34093ffd3d810d3442df3c44.tar.xz cuberite-13144a08e496b89b34093ffd3d810d3442df3c44.tar.zst cuberite-13144a08e496b89b34093ffd3d810d3442df3c44.zip | |
Diffstat (limited to 'src/ClientHandle.cpp')
| -rw-r--r-- | src/ClientHandle.cpp | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/ClientHandle.cpp b/src/ClientHandle.cpp index 4c59b47ce..3cad17849 100644 --- a/src/ClientHandle.cpp +++ b/src/ClientHandle.cpp @@ -213,7 +213,10 @@ void cClientHandle::GenerateOfflineUUID(void) -AString cClientHandle::FormatChatPrefix(bool ShouldAppendChatPrefixes, AString a_ChatPrefixS, AString m_Color1, AString m_Color2) +AString cClientHandle::FormatChatPrefix( + bool ShouldAppendChatPrefixes, const AString & a_ChatPrefixS, + const AString & m_Color1, const AString & m_Color2 +) { if (ShouldAppendChatPrefixes) { @@ -2075,12 +2078,12 @@ bool cClientHandle::CheckBlockInteractionsRate(void) ASSERT(m_Player != nullptr); ASSERT(m_Player->GetWorld() != nullptr); - if ((cRoot::Get()->GetServer()->ShouldLimitPlayerBlockChanges()) && (m_NumBlockChangeInteractionsThisTick > MAX_BLOCK_CHANGE_INTERACTIONS)) + if (!cRoot::Get()->GetServer()->ShouldLimitPlayerBlockChanges()) { - return false; + return true; } - return true; + return (m_NumBlockChangeInteractionsThisTick <= MAX_BLOCK_CHANGE_INTERACTIONS); } @@ -3310,7 +3313,7 @@ void cClientHandle::SocketClosed(void) void cClientHandle::SetSelf(cClientHandlePtr a_Self) { ASSERT(m_Self == nullptr); - m_Self = a_Self; + m_Self = std::move(a_Self); } |