diff --git a/lang/zh_CN.ts b/lang/zh_CN.ts index 9c3251b3..30e661b5 100644 --- a/lang/zh_CN.ts +++ b/lang/zh_CN.ts @@ -39,6 +39,10 @@ %1 logged out 玩家 <b>%1</b> 离开服务器 + + %1 backed + 玩家 <b>%1</b> 回到了游戏 + diff --git a/src/server/server.cpp b/src/server/server.cpp index 6e0157e3..5601ea28 100644 --- a/src/server/server.cpp +++ b/src/server/server.cpp @@ -307,7 +307,10 @@ void Server::handleNameAndPassword(ClientSocket *client, const QString &name, if (player->getState() == Player::Offline) { auto room = player->getRoom(); player->setSocket(client); + player->alive = true; client->disconnect(this); + broadcast("ServerMessage", + tr("%1 backed").arg(player->getScreenName())); room->pushRequest(QString("%1,reconnect").arg(id)); return; } else {