Upstream/Minestom
1
0
Fork 0
mirror of https://github.com/Minestom/Minestom.git synced 2024-12-28 03:57:50 +01:00
Code Issues Projects Releases Wiki Activity

Remove unnecessary #callEvent override in Entity

Browse Source
This commit is contained in:
Felix Cravic 2020-12-09 22:18:11 +01:00
parent 08f7b1c715
commit 30d257c847
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/net/minestom/server/entity/Entity.java
View File

@ -641,16 +641,6 @@ public abstract class Entity implements Viewable, EventHandler, DataContainer, P
return eventCallbacks; return eventCallbacks;
} }
@Override
public <E extends Event> void callEvent(@NotNull Class<E> eventClass, @NotNull E event) {
EventHandler.super.callEvent(eventClass, event);
// Call the same event for the current entity instance
if (instance != null) {
instance.callEvent(eventClass, event);
}
}
/** /**
* Each entity has an unique id (server-wide) which will change after a restart. * Each entity has an unique id (server-wide) which will change after a restart.
* *

10
src/main/java/net/minestom/server/event/handler/EventHandler.java
View File

@ -1,8 +1,10 @@
package net.minestom.server.event.handler; package net.minestom.server.event.handler;
import net.minestom.server.entity.Entity;
import net.minestom.server.event.CancellableEvent; import net.minestom.server.event.CancellableEvent;
import net.minestom.server.event.Event; import net.minestom.server.event.Event;
import net.minestom.server.event.EventCallback; import net.minestom.server.event.EventCallback;
import net.minestom.server.instance.Instance;
import net.minestom.server.utils.validate.Check; import net.minestom.server.utils.validate.Check;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
@ -92,6 +94,14 @@ public interface EventHandler {
for (EventCallback<E> eventCallback : eventCallbacks) { for (EventCallback<E> eventCallback : eventCallbacks) {
eventCallback.run(event); eventCallback.run(event);
} }
// Call the same event for the current entity instance
if (this instanceof Entity) {
final Instance instance = ((Entity) this).getInstance();
if (instance != null) {
instance.callEvent(eventClass, event);
}
}
} }
/** /**