Skip to content

Commit 8f2e9bf

Browse files
nerzhulnerzhul
committedMar 18, 2015
ServerpacketHandler: spelling fixes
·
5.11.00.4.13
1 parent 22730bb commit 8f2e9bf

File tree

1 file changed

+20
-20
lines changed

1 file changed

+20
-20
lines changed
 

Diff for: ‎src/network/serverpackethandler.cpp

+20-20
Original file line numberDiff line numberDiff line change
@@ -343,7 +343,7 @@ void Server::handleCommand_Init_Legacy(NetworkPacket* pkt)
343343
* respond for some time, your server was overloaded or
344344
* things like that.
345345
*/
346-
infostream << "Server::ProcessData(): Cancelling: peer "
346+
infostream << "Server::ProcessData(): Canceling: peer "
347347
<< pkt->getPeerId() << " not found" << std::endl;
348348
return;
349349
}
@@ -826,7 +826,7 @@ void Server::handleCommand_PlayerPos(NetworkPacket* pkt)
826826

827827
Player *player = m_env->getPlayer(pkt->getPeerId());
828828
if (player == NULL) {
829-
errorstream << "Server::ProcessData(): Cancelling: "
829+
errorstream << "Server::ProcessData(): Canceling: "
830830
"No player for peer_id=" << pkt->getPeerId()
831831
<< " disconnecting peer!" << std::endl;
832832
m_con.DisconnectPeer(pkt->getPeerId());
@@ -842,7 +842,7 @@ void Server::handleCommand_PlayerPos(NetworkPacket* pkt)
842842

843843
PlayerSAO *playersao = player->getPlayerSAO();
844844
if (playersao == NULL) {
845-
errorstream << "Server::ProcessData(): Cancelling: "
845+
errorstream << "Server::ProcessData(): Canceling: "
846846
"No player object for peer_id=" << pkt->getPeerId()
847847
<< " disconnecting peer!" << std::endl;
848848
m_con.DisconnectPeer(pkt->getPeerId());
@@ -904,7 +904,7 @@ void Server::handleCommand_InventoryAction(NetworkPacket* pkt)
904904
{
905905
Player *player = m_env->getPlayer(pkt->getPeerId());
906906
if (player == NULL) {
907-
errorstream << "Server::ProcessData(): Cancelling: "
907+
errorstream << "Server::ProcessData(): Canceling: "
908908
"No player for peer_id=" << pkt->getPeerId()
909909
<< " disconnecting peer!" << std::endl;
910910
m_con.DisconnectPeer(pkt->getPeerId());
@@ -913,7 +913,7 @@ void Server::handleCommand_InventoryAction(NetworkPacket* pkt)
913913

914914
PlayerSAO *playersao = player->getPlayerSAO();
915915
if (playersao == NULL) {
916-
errorstream << "Server::ProcessData(): Cancelling: "
916+
errorstream << "Server::ProcessData(): Canceling: "
917917
"No player object for peer_id=" << pkt->getPeerId()
918918
<< " disconnecting peer!" << std::endl;
919919
m_con.DisconnectPeer(pkt->getPeerId());
@@ -1074,7 +1074,7 @@ void Server::handleCommand_ChatMessage(NetworkPacket* pkt)
10741074

10751075
Player *player = m_env->getPlayer(pkt->getPeerId());
10761076
if (player == NULL) {
1077-
errorstream << "Server::ProcessData(): Cancelling: "
1077+
errorstream << "Server::ProcessData(): Canceling: "
10781078
"No player for peer_id=" << pkt->getPeerId()
10791079
<< " disconnecting peer!" << std::endl;
10801080
m_con.DisconnectPeer(pkt->getPeerId());
@@ -1155,7 +1155,7 @@ void Server::handleCommand_Damage(NetworkPacket* pkt)
11551155

11561156
Player *player = m_env->getPlayer(pkt->getPeerId());
11571157
if (player == NULL) {
1158-
errorstream << "Server::ProcessData(): Cancelling: "
1158+
errorstream << "Server::ProcessData(): Canceling: "
11591159
"No player for peer_id=" << pkt->getPeerId()
11601160
<< " disconnecting peer!" << std::endl;
11611161
m_con.DisconnectPeer(pkt->getPeerId());
@@ -1164,7 +1164,7 @@ void Server::handleCommand_Damage(NetworkPacket* pkt)
11641164

11651165
PlayerSAO *playersao = player->getPlayerSAO();
11661166
if (playersao == NULL) {
1167-
errorstream << "Server::ProcessData(): Cancelling: "
1167+
errorstream << "Server::ProcessData(): Canceling: "
11681168
"No player object for peer_id=" << pkt->getPeerId()
11691169
<< " disconnecting peer!" << std::endl;
11701170
m_con.DisconnectPeer(pkt->getPeerId());
@@ -1189,7 +1189,7 @@ void Server::handleCommand_Breath(NetworkPacket* pkt)
11891189

11901190
Player *player = m_env->getPlayer(pkt->getPeerId());
11911191
if (player == NULL) {
1192-
errorstream << "Server::ProcessData(): Cancelling: "
1192+
errorstream << "Server::ProcessData(): Canceling: "
11931193
"No player for peer_id=" << pkt->getPeerId()
11941194
<< " disconnecting peer!" << std::endl;
11951195
m_con.DisconnectPeer(pkt->getPeerId());
@@ -1209,7 +1209,7 @@ void Server::handleCommand_Breath(NetworkPacket* pkt)
12091209

12101210
PlayerSAO *playersao = player->getPlayerSAO();
12111211
if (playersao == NULL) {
1212-
errorstream << "Server::ProcessData(): Cancelling: "
1212+
errorstream << "Server::ProcessData(): Canceling: "
12131213
"No player object for peer_id=" << pkt->getPeerId()
12141214
<< " disconnecting peer!" << std::endl;
12151215
m_con.DisconnectPeer(pkt->getPeerId());
@@ -1254,7 +1254,7 @@ void Server::handleCommand_Password(NetworkPacket* pkt)
12541254

12551255
Player *player = m_env->getPlayer(pkt->getPeerId());
12561256
if (player == NULL) {
1257-
errorstream << "Server::ProcessData(): Cancelling: "
1257+
errorstream << "Server::ProcessData(): Canceling: "
12581258
"No player for peer_id=" << pkt->getPeerId()
12591259
<< " disconnecting peer!" << std::endl;
12601260
m_con.DisconnectPeer(pkt->getPeerId());
@@ -1291,7 +1291,7 @@ void Server::handleCommand_Password(NetworkPacket* pkt)
12911291
} else {
12921292
actionstream << player->getName() << " tries to change password but "
12931293
<< "it fails" << std::endl;
1294-
SendChatMessage(pkt->getPeerId(), L"Password change failed or inavailable.");
1294+
SendChatMessage(pkt->getPeerId(), L"Password change failed or unavailable.");
12951295
}
12961296
}
12971297

@@ -1302,7 +1302,7 @@ void Server::handleCommand_PlayerItem(NetworkPacket* pkt)
13021302

13031303
Player *player = m_env->getPlayer(pkt->getPeerId());
13041304
if (player == NULL) {
1305-
errorstream << "Server::ProcessData(): Cancelling: "
1305+
errorstream << "Server::ProcessData(): Canceling: "
13061306
"No player for peer_id=" << pkt->getPeerId()
13071307
<< " disconnecting peer!" << std::endl;
13081308
m_con.DisconnectPeer(pkt->getPeerId());
@@ -1311,7 +1311,7 @@ void Server::handleCommand_PlayerItem(NetworkPacket* pkt)
13111311

13121312
PlayerSAO *playersao = player->getPlayerSAO();
13131313
if (playersao == NULL) {
1314-
errorstream << "Server::ProcessData(): Cancelling: "
1314+
errorstream << "Server::ProcessData(): Canceling: "
13151315
"No player object for peer_id=" << pkt->getPeerId()
13161316
<< " disconnecting peer!" << std::endl;
13171317
m_con.DisconnectPeer(pkt->getPeerId());
@@ -1329,7 +1329,7 @@ void Server::handleCommand_Respawn(NetworkPacket* pkt)
13291329
{
13301330
Player *player = m_env->getPlayer(pkt->getPeerId());
13311331
if (player == NULL) {
1332-
errorstream << "Server::ProcessData(): Cancelling: "
1332+
errorstream << "Server::ProcessData(): Canceling: "
13331333
"No player for peer_id=" << pkt->getPeerId()
13341334
<< " disconnecting peer!" << std::endl;
13351335
m_con.DisconnectPeer(pkt->getPeerId());
@@ -1345,7 +1345,7 @@ void Server::handleCommand_Respawn(NetworkPacket* pkt)
13451345
<< PP(player->getPosition()/BS) << std::endl;
13461346

13471347
// ActiveObject is added to environment in AsyncRunStep after
1348-
// the previous addition has been succesfully removed
1348+
// the previous addition has been successfully removed
13491349
}
13501350

13511351
void Server::handleCommand_Interact(NetworkPacket* pkt)
@@ -1377,7 +1377,7 @@ void Server::handleCommand_Interact(NetworkPacket* pkt)
13771377

13781378
Player *player = m_env->getPlayer(pkt->getPeerId());
13791379
if (player == NULL) {
1380-
errorstream << "Server::ProcessData(): Cancelling: "
1380+
errorstream << "Server::ProcessData(): Canceling: "
13811381
"No player for peer_id=" << pkt->getPeerId()
13821382
<< " disconnecting peer!" << std::endl;
13831383
m_con.DisconnectPeer(pkt->getPeerId());
@@ -1386,7 +1386,7 @@ void Server::handleCommand_Interact(NetworkPacket* pkt)
13861386

13871387
PlayerSAO *playersao = player->getPlayerSAO();
13881388
if (playersao == NULL) {
1389-
errorstream << "Server::ProcessData(): Cancelling: "
1389+
errorstream << "Server::ProcessData(): Canceling: "
13901390
"No player object for peer_id=" << pkt->getPeerId()
13911391
<< " disconnecting peer!" << std::endl;
13921392
m_con.DisconnectPeer(pkt->getPeerId());
@@ -1778,7 +1778,7 @@ void Server::handleCommand_NodeMetaFields(NetworkPacket* pkt)
17781778

17791779
Player *player = m_env->getPlayer(pkt->getPeerId());
17801780
if (player == NULL) {
1781-
errorstream << "Server::ProcessData(): Cancelling: "
1781+
errorstream << "Server::ProcessData(): Canceling: "
17821782
"No player for peer_id=" << pkt->getPeerId()
17831783
<< " disconnecting peer!" << std::endl;
17841784
m_con.DisconnectPeer(pkt->getPeerId());
@@ -1787,7 +1787,7 @@ void Server::handleCommand_NodeMetaFields(NetworkPacket* pkt)
17871787

17881788
PlayerSAO *playersao = player->getPlayerSAO();
17891789
if (playersao == NULL) {
1790-
errorstream << "Server::ProcessData(): Cancelling: "
1790+
errorstream << "Server::ProcessData(): Canceling: "
17911791
"No player object for peer_id=" << pkt->getPeerId()
17921792
<< " disconnecting peer!" << std::endl;
17931793
m_con.DisconnectPeer(pkt->getPeerId());

0 commit comments

Comments
 (0)
Please sign in to comment.