@@ -45,0 +49,4 @@
+    private static final Reflection.FieldAccessor<Integer> useEntityTarget = Reflection.getField(useEntity, int.class, 0);
+    private static final Reflection.FieldAccessor<Integer> useEntityAction = Reflection.getField(useEntity, int.class, 1);
+
+    private final HashMap<Integer, REntity> entityMap = new HashMap<>();

@@ -50,0 +60,4 @@
+    private BiFunction<Player, Object, Object> filter = (player, packet) -> {
+        if (callback == null) return packet;
+        int target = useEntityTarget.get(packet);
+        if (!entityMap.containsKey(target)) return packet;

@@ -50,0 +63,4 @@
+        if (!entityMap.containsKey(target)) return packet;
+
+        REntity entity = entityMap.get(target);
+        int action = useEntityAction.get(packet);

@@ -50,0 +67,4 @@
+        if (action == 2) action = 0;
+        int finalAction = action;
+
+        Bukkit.getScheduler().runTaskLater(Core.getInstance(), () -> {

@@ -50,2 +75,4 @@
+
     public REntityServer() {
         Core.getInstance().getServer().getPluginManager().registerEvents(this, Core.getInstance());
+        TinyProtocol.instance.addFilter(useEntity, filter);

@@ -64,6 +95,7 @@ public class REntityServer implements Listener {
     }
 
     public void close() {
+        TinyProtocol.instance.removeFilter(useEntity, filter);