Skip to content

Commit 6d79a33

Browse files
committed
Start event timelines and dont remove player on disc
1 parent 3d15f68 commit 6d79a33

3 files changed

Lines changed: 6 additions & 13 deletions

File tree

rectangles/engine/Rectangles.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ public Rectangles(boolean isServer) {
6464

6565
// Start timelines
6666
globalTimeline.start();
67+
eventTimeline.start();
6768
physicsTimeline.start();
6869
networkTimeline.start();
6970
renderTimeline.start();

rectangles/engine/Replay.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,20 +83,23 @@ public void handleEvent(Event e) {
8383
data.put("caller", Rectangles.player.getUUID());
8484
this.history.add(end);
8585
Rectangles.eventTimeline = new LocalTimeline(Rectangles.globalTimeline, 8);
86+
Rectangles.eventTimeline.start();
8687
Rectangles.eventManager.getEventQueue().addAll(this.history);
8788
System.out.println("Started Replay");
8889
}
8990
}
9091
break;
9192
case('1'):
9293
Rectangles.eventTimeline = new LocalTimeline(Rectangles.globalTimeline, 8);
94+
Rectangles.eventTimeline.start();
9395
break;
9496
case('2'):
9597
Rectangles.eventTimeline = new LocalTimeline(Rectangles.globalTimeline, 2);
96-
98+
Rectangles.eventTimeline.start();
9799
break;
98100
case('3'):
99101
Rectangles.eventTimeline = new LocalTimeline(Rectangles.globalTimeline, 1);
102+
Rectangles.eventTimeline.start();
100103
break;
101104
default:
102105
break;
@@ -115,6 +118,7 @@ public void handleEvent(Event e) {
115118
synchronized (this.lock) {
116119
this.playing = false;
117120
Rectangles.eventTimeline = new LocalTimeline(Rectangles.globalTimeline, 2);
121+
Rectangles.eventTimeline.start();
118122
Rectangles.physicsTimeline.unpause();
119123
}
120124
break;

rectangles/networking/Client.java

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -121,18 +121,6 @@ public void run() {
121121
public synchronized void stop() {
122122
this.isStopped = true;
123123
try {
124-
Packet p = new Packet(Packet.PACKET_DESTROY, Rectangles.player);
125-
synchronized (this.output) {
126-
try {
127-
//System.out.println("Sent: " + p.getSerialData());
128-
this.output.writeUTF(p.getSerialData());
129-
} catch (SocketException e) {
130-
// Ignore client has just disconnected
131-
} catch (IOException e) {
132-
System.out.println("Error writing to socket: " + this.socket.toString());
133-
e.printStackTrace();
134-
}
135-
}
136124
this.socket.close();
137125
} catch (IOException e) {
138126
throw new RuntimeException("Error closing client socket", e);

0 commit comments

Comments
 (0)