summaryrefslogtreecommitdiffstats
path: root/src/Protocol
diff options
context:
space:
mode:
authorTiger Wang <ziwei.tiger@outlook.com>2020-09-18 14:17:29 +0200
committerTiger Wang <ziwei.tiger@outlook.com>2020-09-18 17:41:06 +0200
commite2e78abdb74d9fa8f6ff161964a06f6612f3272b (patch)
tree0baafb05173c6ee64679aa40c3dee4b2b6a72114 /src/Protocol
parentRemove unused ServerPort argument (diff)
downloadcuberite-e2e78abdb74d9fa8f6ff161964a06f6612f3272b.tar
cuberite-e2e78abdb74d9fa8f6ff161964a06f6612f3272b.tar.gz
cuberite-e2e78abdb74d9fa8f6ff161964a06f6612f3272b.tar.bz2
cuberite-e2e78abdb74d9fa8f6ff161964a06f6612f3272b.tar.lz
cuberite-e2e78abdb74d9fa8f6ff161964a06f6612f3272b.tar.xz
cuberite-e2e78abdb74d9fa8f6ff161964a06f6612f3272b.tar.zst
cuberite-e2e78abdb74d9fa8f6ff161964a06f6612f3272b.zip
Diffstat (limited to 'src/Protocol')
-rw-r--r--src/Protocol/ProtocolRecognizer.cpp18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/Protocol/ProtocolRecognizer.cpp b/src/Protocol/ProtocolRecognizer.cpp
index 521f9e247..b72f73f3d 100644
--- a/src/Protocol/ProtocolRecognizer.cpp
+++ b/src/Protocol/ProtocolRecognizer.cpp
@@ -25,9 +25,9 @@
-struct sUnsupportedButPingableProtocolException : public std::runtime_error
+struct UnsupportedButPingableProtocolException : public std::runtime_error
{
- explicit sUnsupportedButPingableProtocolException() :
+ explicit UnsupportedButPingableProtocolException() :
std::runtime_error("")
{
}
@@ -37,9 +37,9 @@ struct sUnsupportedButPingableProtocolException : public std::runtime_error
-struct sTriedToJoinWithUnsupportedProtocolException : public std::runtime_error
+struct TriedToJoinWithUnsupportedProtocolException : public std::runtime_error
{
- explicit sTriedToJoinWithUnsupportedProtocolException(const std::string & a_Message) :
+ explicit TriedToJoinWithUnsupportedProtocolException(const std::string & a_Message) :
std::runtime_error(a_Message)
{
}
@@ -114,7 +114,7 @@ void cMultiVersionProtocol::HandleIncomingDataInRecognitionStage(cClientHandle &
m_Protocol->DataReceived(m_Buffer, a_In.data(), a_In.size());
};
}
- catch (const sUnsupportedButPingableProtocolException &)
+ catch (const UnsupportedButPingableProtocolException &)
{
// Got a server list ping for an unrecognised version,
// switch into responding to unknown protocols mode:
@@ -253,7 +253,7 @@ std::unique_ptr<cProtocol> cMultiVersionProtocol::TryRecognizeLengthedProtocol(c
a_Client.GetIPString().c_str(), PacketType
);
- throw sTriedToJoinWithUnsupportedProtocolException(
+ throw TriedToJoinWithUnsupportedProtocolException(
Printf("Your client isn't supported.\nTry connecting with Minecraft " MCS_CLIENT_VERSIONS, ProtocolVersion)
);
}
@@ -267,7 +267,7 @@ std::unique_ptr<cProtocol> cMultiVersionProtocol::TryRecognizeLengthedProtocol(c
{
// TryRecognizeProtocol guarantees that we will have as much
// data to read as the client claims in the protocol length field:
- throw sTriedToJoinWithUnsupportedProtocolException("Incorrect amount of data received - hacked client?");
+ throw TriedToJoinWithUnsupportedProtocolException("Incorrect amount of data received - hacked client?");
}
// TODO: this should be a protocol property, not ClientHandle:
@@ -310,12 +310,12 @@ std::unique_ptr<cProtocol> cMultiVersionProtocol::TryRecognizeLengthedProtocol(c
if (NextState != cProtocol::State::Status)
{
- throw sTriedToJoinWithUnsupportedProtocolException(
+ throw TriedToJoinWithUnsupportedProtocolException(
Printf("Unsupported protocol version %u.\nTry connecting with Minecraft " MCS_CLIENT_VERSIONS, ProtocolVersion)
);
}
- throw sUnsupportedButPingableProtocolException();
+ throw UnsupportedButPingableProtocolException();
}
}
}