UnlegitDqrk/unlegitlibrary
1
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug fix

Browse Source
This commit is contained in:
Finn
2024-10-05 16:29:55 +02:00
parent fb2e5e2162
commit 762bdcdb49
3 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/me/finn/unlegitlibrary/network/system/server/ConnectionHandler.java
View File

@@ -47,7 +47,6 @@ public class ConnectionHandler {
receiveThread.start(); receiveThread.start();
sendPacket(new ClientIDPacket(clientID)); sendPacket(new ClientIDPacket(clientID));
server.getEventManager().executeEvent(new S_ConnectionHandlerConnectedEvent(this));
} }
public final int getClientID() { public final int getClientID() {

14
src/main/java/me/finn/unlegitlibrary/network/system/server/NetworkServer.java
View File

@@ -14,6 +14,7 @@ import me.finn.unlegitlibrary.network.system.packets.impl.ClientDisconnectPacket
import me.finn.unlegitlibrary.network.system.packets.impl.ClientIDPacket; import me.finn.unlegitlibrary.network.system.packets.impl.ClientIDPacket;
import me.finn.unlegitlibrary.network.system.server.events.connection.S_IncomingConnectionEvent; import me.finn.unlegitlibrary.network.system.server.events.connection.S_IncomingConnectionEvent;
import me.finn.unlegitlibrary.network.system.server.events.connection.S_IncomingConnectionThreadFailedEvent; import me.finn.unlegitlibrary.network.system.server.events.connection.S_IncomingConnectionThreadFailedEvent;
import me.finn.unlegitlibrary.network.system.server.events.state.connection.S_ConnectionHandlerConnectedEvent;
import me.finn.unlegitlibrary.network.system.server.events.state.server.S_StartedEvent; import me.finn.unlegitlibrary.network.system.server.events.state.server.S_StartedEvent;
import me.finn.unlegitlibrary.network.system.server.events.state.server.S_StoppedEvent; import me.finn.unlegitlibrary.network.system.server.events.state.server.S_StoppedEvent;
import me.finn.unlegitlibrary.network.system.packets.Packet; import me.finn.unlegitlibrary.network.system.packets.Packet;
@@ -243,8 +244,17 @@ public class NetworkServer extends DefaultMethodsOverrider {
if (logger == null) System.out.println("Accepted connection from " + socket.getRemoteSocketAddress()); if (logger == null) System.out.println("Accepted connection from " + socket.getRemoteSocketAddress());
else logger.info("Accepted connection from " + socket.getRemoteSocketAddress()); else logger.info("Accepted connection from " + socket.getRemoteSocketAddress());
eventManager.executeEvent(new S_IncomingConnectionEvent(this, socket)); S_IncomingConnectionEvent incomingConnectionEvent = new S_IncomingConnectionEvent(this, socket);
connectionHandlers.add(new ConnectionHandler(this, socket, connectionHandlers.size() + 1)); eventManager.executeEvent(incomingConnectionEvent);
if (incomingConnectionEvent.isCancelled()) {
socket.close();
continue;
}
ConnectionHandler connectionHandler = new ConnectionHandler(this, socket, connectionHandlers.size() + 1);
connectionHandlers.add(connectionHandler);
eventManager.executeEvent(new S_ConnectionHandlerConnectedEvent(connectionHandler));
} }
} catch (IOException exception) { } catch (IOException exception) {
if (logger == null) System.err.println("Accept exception: " + exception.getMessage()); if (logger == null) System.err.println("Accept exception: " + exception.getMessage());

3
src/main/java/me/finn/unlegitlibrary/network/system/server/events/connection/S_IncomingConnectionEvent.java
View File

@@ -16,12 +16,13 @@
package me.finn.unlegitlibrary.network.system.server.events.connection; package me.finn.unlegitlibrary.network.system.server.events.connection;
import me.finn.unlegitlibrary.event.impl.CancellableEvent;
import me.finn.unlegitlibrary.event.impl.Event; import me.finn.unlegitlibrary.event.impl.Event;
import me.finn.unlegitlibrary.network.system.server.NetworkServer; import me.finn.unlegitlibrary.network.system.server.NetworkServer;
import java.net.Socket; import java.net.Socket;
public class S_IncomingConnectionEvent extends Event { public class S_IncomingConnectionEvent extends CancellableEvent {
public final NetworkServer server; public final NetworkServer server;
public final Socket socket; public final Socket socket;