Skip to content

Commit 750abef

Browse files
committed
server: make the P_PLAYER_REFUSED packets work
They didn't work correctly, because the client didn't have an ID when the packet came, but the server called send_packet with the ID that the client had got if it had sent a valid P_NEW_PLAYER packet.
1 parent c454f8b commit 750abef

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

server.c

+4-4
Original file line numberDiff line numberDiff line change
@@ -1240,7 +1240,7 @@ static void read_data(void)
12401240
message("Incompatible client version.\n",2);
12411241
packet[0]=P_PLAYER_REFUSED;
12421242
packet[1]=E_PLAYER_REFUSED;
1243-
send_packet(packet,2,(struct sockaddr*)(&client),0,last_player->member.id);
1243+
send_packet(packet,2,(struct sockaddr*)(&client),0,0);
12441244
break;
12451245
}
12461246
maj=packet[2];
@@ -1253,7 +1253,7 @@ static void read_data(void)
12531253
message("Incompatible client version. Player refused.\n",2);
12541254
packet[0]=P_PLAYER_REFUSED;
12551255
packet[1]=E_INCOMPATIBLE_VERSION;
1256-
send_packet(packet,2,(struct sockaddr*)(&client),0,last_player->member.id);
1256+
send_packet(packet,2,(struct sockaddr*)(&client),0,0);
12571257
break;
12581258
}
12591259
if (strlen(packet+5) > MAX_NAME_LEN)
@@ -1268,7 +1268,7 @@ static void read_data(void)
12681268
message(txt,2);
12691269
packet[0]=P_PLAYER_REFUSED;
12701270
packet[1]=E_NAME_IN_USE;
1271-
send_packet(packet,2,(struct sockaddr*)(&client),0,last_player->member.id);
1271+
send_packet(packet,2,(struct sockaddr*)(&client),0,0);
12721272

12731273
break;
12741274
}
@@ -1278,7 +1278,7 @@ static void read_data(void)
12781278
message("Player refused.\n",2);
12791279
packet[0]=P_PLAYER_REFUSED;
12801280
packet[1]=E_PLAYER_REFUSED;
1281-
send_packet(packet,2,(struct sockaddr*)(&client),0,last_player->member.id);
1281+
send_packet(packet,2,(struct sockaddr*)(&client),0,0);
12821282
break;
12831283
}
12841284
snprintf(txt,256,"Player #%d accepted, name \"%s\", address %s.\n",n_players,packet+5,txt1);

0 commit comments

Comments
 (0)