Skip to content

Commit a357227

Browse files
committed
fix(client): crash on match room
1 parent a2b21a2 commit a357227

File tree

3 files changed

+19
-14
lines changed

3 files changed

+19
-14
lines changed

client/src/main/java/io/exterminator3618/client/api/RoomStatus.java

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -117,15 +117,6 @@ public void setTotalPlayers(int totalPlayers) {
117117
this.totalPlayers = totalPlayers;
118118
}
119119

120-
public MemberStatus[] getMembers() {
121-
return members.toArray(new MemberStatus[] {});
122-
}
123-
124-
public void setMembers(MemberStatus[] members) {
125-
this.members.clear();
126-
Collections.addAll(this.members, members);
127-
}
128-
129120
public ArrayList<MemberStatus> getMembersList() {
130121
return members;
131122
}

client/src/main/java/io/exterminator3618/client/screens/OnlineGameScreen.java

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import io.exterminator3618.client.Exterminator3618;
44
import io.exterminator3618.client.api.ApiClient;
55
import io.exterminator3618.client.api.RoomStatus;
6+
import io.exterminator3618.client.components.Ball;
67
import io.exterminator3618.client.components.TextButton;
78
import org.slf4j.Logger;
89
import org.slf4j.LoggerFactory;
@@ -11,7 +12,12 @@
1112
import java.util.LinkedList;
1213
import java.util.Queue;
1314

14-
import static io.exterminator3618.client.Constants.POLL_INTERVAL_MS;
15+
import static io.exterminator3618.client.Constants.*;
16+
import static io.exterminator3618.client.Constants.BALL_HEIGHT;
17+
import static io.exterminator3618.client.Constants.BALL_REGION_NAME;
18+
import static io.exterminator3618.client.Constants.BALL_SPEED;
19+
import static io.exterminator3618.client.Constants.BALL_WIDTH;
20+
import static io.exterminator3618.client.Constants.WINDOW_HEIGHT;
1521

1622
public class OnlineGameScreen extends GameScreen {
1723

@@ -42,7 +48,15 @@ public OnlineGameScreen(Exterminator3618 game) {
4248
log.error("Failed to fetch initial room status");
4349
throw new IllegalStateException("Failed to launch online game screen");
4450
}
45-
loadLevel(Integer.parseInt(mapCode.substring(5)), null);
51+
loadLevel(Integer.parseInt(mapCode.substring(5)), new Ball(
52+
WINDOW_WIDTH / 2 - BALL_WIDTH / 2,
53+
WINDOW_HEIGHT / 2 - BALL_HEIGHT / 2,
54+
BALL_WIDTH,
55+
BALL_HEIGHT,
56+
BALL_REGION_NAME,
57+
BALL_SPEED,
58+
67
59+
));
4660
startTime = System.currentTimeMillis();
4761
statusPollingThread.start();
4862
}
@@ -90,10 +104,10 @@ private void pollStatus() {
90104
public void render(float delta) {
91105
super.render(delta);
92106
renderer.begin();
93-
renderer.setFontSize(14);
107+
renderer.setFontSize(24);
94108
synchronized (playerStates) {
95109
for (int i = 0; i < playerStates.size(); i++) {
96-
renderer.drawText(playerStates.get(i), 50, 850 - i * 30);
110+
renderer.drawText(playerStates.get(i), 1400, 400 - i * 50);
97111
}
98112
}
99113
renderer.setFontSize(36);

client/src/main/java/io/exterminator3618/client/screens/OnlineMenuScreen.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,7 @@ private static class AcceptInviteButton extends TextButton {
297297
public String fromUsername;
298298

299299
public AcceptInviteButton(String fromUsername, int row) {
300-
super("Accept match with " + fromUsername, WINDOW_WIDTH - 550, WINDOW_HEIGHT - 50 - (row * 60), 500, 50, true);
300+
super("Accept match with " + fromUsername, WINDOW_WIDTH - 550, WINDOW_HEIGHT - 100 - (row * 60), 500, 50, true);
301301
this.fromUsername = fromUsername;
302302
}
303303

0 commit comments

Comments
 (0)