More bug fixes

This commit is contained in:
2024-07-10 00:11:32 +02:00
parent 23ab5bf404
commit 376c1d6f56
3 changed files with 11 additions and 9 deletions

View File

@@ -6,7 +6,7 @@
<groupId>me.finn.unlegitlibrary</groupId> <groupId>me.finn.unlegitlibrary</groupId>
<artifactId>unlegitlibrary</artifactId> <artifactId>unlegitlibrary</artifactId>
<version>1.1</version> <version>1.2</version>
<properties> <properties>
<maven.compiler.source>21</maven.compiler.source> <maven.compiler.source>21</maven.compiler.source>

View File

@@ -54,15 +54,17 @@ public class EventManager extends DefaultMethodsOverrider {
HashMap<EventPriority, HashMap<Object, Method>> priorityMap = registeredListener.get(eventClass); HashMap<EventPriority, HashMap<Object, Method>> priorityMap = registeredListener.get(eventClass);
if (priorityMap != null) { if (priorityMap != null) {
for (EventPriority priority : priorityMap.keySet()) { synchronized (priorityMap) {
HashMap<Object, Method> listeners = priorityMap.get(priority); for (EventPriority priority : priorityMap.keySet()) {
if (listeners != null) { HashMap<Object, Method> listeners = priorityMap.get(priority);
listeners.remove(clazz); if (listeners != null) {
if (listeners.isEmpty()) priorityMap.remove(priority); listeners.remove(clazz);
if (listeners.isEmpty()) priorityMap.remove(priority);
}
} }
}
if (priorityMap.isEmpty()) registeredListener.remove(eventClass); if (priorityMap.isEmpty()) registeredListener.remove(eventClass);
}
} }
} }

View File

@@ -97,7 +97,7 @@ public class ClientHandler {
clientID = -1; clientID = -1;
receiveThread.interrupt(); receiveThread.interrupt();
networkServer.getClientHandlers().remove(this); synchronized (networkServer.getClientHandlers()) { networkServer.getClientHandlers().remove(this); }
networkServer.getEventManager().executeEvent(new S_ClientStoppedEvent(this)); networkServer.getEventManager().executeEvent(new S_ClientStoppedEvent(this));
} }