Skip to content

feat: send BeforeDisconnectEvent before disconnecting clients #5077

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 2 commits into
base: develop
Choose a base branch
from
Draft

feat: send BeforeDisconnectEvent before disconnecting clients #5077

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a7ea40a
feat: add BeforeDisconnectEvent
jdrueckert Nov 6, 2022
67db187
feat: send BeforeDisconnectEvent before disconnecting clients
jdrueckert Nov 6, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions engine/src/main/java/org/terasology/engine/network/events/BeforeDisconnectEvent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
// Copyright 2022 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0

package org.terasology.engine.network.events;

import org.terasology.gestalt.entitysystem.event.Event;

/**
* Event notifying of a client scheduled for disconnect.
*/
public class BeforeDisconnectEvent implements Event {

public BeforeDisconnectEvent() {
}
}
6 changes: 5 additions & 1 deletion engine/src/main/java/org/terasology/engine/network/internal/NetworkSystemImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@
import org.terasology.engine.network.NetworkMode;
import org.terasology.engine.network.NetworkSystem;
import org.terasology.engine.network.Server;
import org.terasology.engine.network.events.BeforeDisconnectEvent;
import org.terasology.engine.network.events.ConnectedEvent;
import org.terasology.engine.network.events.DisconnectedEvent;
import org.terasology.engine.network.exceptions.HostingFailedException;
Expand Down Expand Up @@ -354,7 +355,10 @@ private void processPendingDisconnects() {
if (!disconnectedClients.isEmpty()) {
List<NetClient> removedPlayers = Lists.newArrayListWithExpectedSize(disconnectedClients.size());
disconnectedClients.drainTo(removedPlayers);
removedPlayers.forEach(this::processRemovedClient);
for (NetClient client : removedPlayers) {
client.getEntity().send(new BeforeDisconnectEvent());
processRemovedClient(client);
}
}
}

Expand Down
Loading