From 967039101988fd54848639af0ba32d36ab1039d7 Mon Sep 17 00:00:00 2001
From: Stone_Red <56473591+Stone-Red-Code@users.noreply.github.com>
Date: Sat, 7 May 2022 03:54:58 +0200
Subject: [PATCH] Fix method signature of `removeListener` method

---
 src/main/java/com/yes/yes/utils/Entity.java             | 2 +-
 src/main/java/com/yes/yes/utils/EventHandler.java       | 2 +-
 src/main/java/com/yes/yes/utils/GlobalEventHandler.java | 2 +-
 src/main/java/com/yes/yes/world/Chunk.java              | 3 ++-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/yes/yes/utils/Entity.java b/src/main/java/com/yes/yes/utils/Entity.java
index 0357831..e1839b1 100644
--- a/src/main/java/com/yes/yes/utils/Entity.java
+++ b/src/main/java/com/yes/yes/utils/Entity.java
@@ -53,7 +53,7 @@ public abstract class Entity extends javafx.scene.Group {
         handler.addListener(eventName, function);
     }
 
-    public final void removeListener(String eventName, Function<Object, Void> function) {
+    public final <T> void removeListener(String eventName, Consumer<T> function) {
         handler.removeListener(eventName, function);
     }
 
diff --git a/src/main/java/com/yes/yes/utils/EventHandler.java b/src/main/java/com/yes/yes/utils/EventHandler.java
index 0b30ae2..b9c519d 100644
--- a/src/main/java/com/yes/yes/utils/EventHandler.java
+++ b/src/main/java/com/yes/yes/utils/EventHandler.java
@@ -17,7 +17,7 @@ public class EventHandler {
         events.get(eventName).add((e) -> function.accept((T) e));
     }
 
-    public void removeListener(String eventName, Function<Object, Void> function) throws IllegalArgumentException {
+    public <T> void removeListener(String eventName, Consumer<T> function) throws IllegalArgumentException {
         //NOTE: This needs to be called otherwise memory leak
         if (!events.containsKey(eventName)) {
             throw new IllegalArgumentException("Event " + eventName + " does not exist!");
diff --git a/src/main/java/com/yes/yes/utils/GlobalEventHandler.java b/src/main/java/com/yes/yes/utils/GlobalEventHandler.java
index 0f5e558..2757b2a 100644
--- a/src/main/java/com/yes/yes/utils/GlobalEventHandler.java
+++ b/src/main/java/com/yes/yes/utils/GlobalEventHandler.java
@@ -13,7 +13,7 @@ public class GlobalEventHandler {
         handler.addListener(eventName, function);
     }
 
-    public static void removeListener(String eventName, Function<Object, Void> function) {
+    public static <T> void removeListener(String eventName, Consumer<T> function) {
         handler.removeListener(eventName, function);
     }
 
diff --git a/src/main/java/com/yes/yes/world/Chunk.java b/src/main/java/com/yes/yes/world/Chunk.java
index 99bbfb7..e1b3e13 100644
--- a/src/main/java/com/yes/yes/world/Chunk.java
+++ b/src/main/java/com/yes/yes/world/Chunk.java
@@ -44,7 +44,8 @@ public class Chunk extends GridPane {
     }
 
     public void removeEntity(Coordinate pos) {
-        this.getChildren().remove(data[pos.x + pos.y * CHUNK_SIZE]);
+        Entity entity = getEntity(pos);
+        this.getChildren().remove(entity);
         data[pos.x + pos.y * CHUNK_SIZE] = null;
     }