|
@ -266,7 +266,7 @@ impl<EG: EntityGateway> CharacterServerState<EG> { |
|
|
client.security_data[0..4].clone_from_slice(&[1,3,3,7]);
|
|
|
client.security_data[0..4].clone_from_slice(&[1,3,3,7]);
|
|
|
client.security_data[4] = select.slot as u8;
|
|
|
client.security_data[4] = select.slot as u8;
|
|
|
client.security_data[5] = 1;
|
|
|
client.security_data[5] = 1;
|
|
|
Ok(vec![SendCharacterPacket::LoginResponse(LoginResponse::by_char_select(user.guildcard.unwrap_or(1),
|
|
|
|
|
|
|
|
|
Ok(vec![SendCharacterPacket::LoginResponse(LoginResponse::by_char_select(user.guildcard.unwrap_or(0),
|
|
|
user.team_id.unwrap_or(1),
|
|
|
user.team_id.unwrap_or(1),
|
|
|
client.security_data)),
|
|
|
client.security_data)),
|
|
|
SendCharacterPacket::CharAck(CharAck {
|
|
|
SendCharacterPacket::CharAck(CharAck {
|
|
@ -340,7 +340,7 @@ impl<EG: EntityGateway> ServerState for CharacterServerState<EG> { |
|
|
-> Result<Box<dyn Iterator<Item = (ClientId, SendCharacterPacket)>>, CharacterError> {
|
|
|
-> Result<Box<dyn Iterator<Item = (ClientId, SendCharacterPacket)>>, CharacterError> {
|
|
|
Ok(match pkt {
|
|
|
Ok(match pkt {
|
|
|
RecvCharacterPacket::Login(login) => {
|
|
|
RecvCharacterPacket::Login(login) => {
|
|
|
if login.security_data[8..12] == [1,3,3,7] {
|
|
|
|
|
|
|
|
|
if login.security_data[0..4] == [1,3,3,7] {
|
|
|
Box::new(self.send_ship_list(id, login)?.into_iter().map(move |pkt| (id, pkt)))
|
|
|
Box::new(self.send_ship_list(id, login)?.into_iter().map(move |pkt| (id, pkt)))
|
|
|
}
|
|
|
}
|
|
|
else {
|
|
|
else {
|
|
@ -415,7 +415,7 @@ impl<EG: EntityGateway> ServerState for CharacterServerState<EG> { |
|
|
client.security_data[5] = 1;
|
|
|
client.security_data[5] = 1;
|
|
|
user.flags = 0;
|
|
|
user.flags = 0;
|
|
|
self.entity_gateway.set_user(&user);
|
|
|
self.entity_gateway.set_user(&user);
|
|
|
Box::new(vec![SendCharacterPacket::LoginResponse(LoginResponse::by_char_select(user.guildcard.unwrap_or(0),
|
|
|
|
|
|
|
|
|
Box::new(vec![SendCharacterPacket::LoginResponse(LoginResponse::by_char_select(user.guildcard.unwrap_or(1),
|
|
|
user.team_id.unwrap_or(0),
|
|
|
user.team_id.unwrap_or(0),
|
|
|
client.security_data)),
|
|
|
client.security_data)),
|
|
|
SendCharacterPacket::CharAck(CharAck {
|
|
|
SendCharacterPacket::CharAck(CharAck {
|
|
|