Error when WanderingTrader gets killed and Revive enabled

[t3hw00t]

[00:17:29 ERROR]: Could not pass event RealisticRemoveEvent to RealisticVillagers v3.3.6.4
java.lang.ClassCastException: class me.matsubara.realisticvillagers.entity.v1_21_10.WanderingTraderNPC cannot be cast to class me.matsubara.realisticvillagers.entity.v1_21_10.villager.VillagerNPC (me.matsubara.realisticvillagers.entity.v1_21_10.WanderingTraderNPC and me.matsubara.realisticvillagers.entity.v1_21_10.villager.VillagerNPC are in unnamed module of loader 'RealisticVillagers-3.3.6.4.jar' @24186c5)
at RealisticVillagers-3.3.6.4.jar/me.matsubara.realisticvillagers.nms.v1_21_10.NMSConverter.getNPCTag(NMSConverter.java:206) ~[RealisticVillagers-3.3.6.4.jar:?]
at RealisticVillagers-3.3.6.4.jar/me.matsubara.realisticvillagers.manager.revive.ReviveManager.handleTombstone(ReviveManager.java:165) ~[RealisticVillagers-3.3.6.4.jar:?]
at RealisticVillagers-3.3.6.4.jar/me.matsubara.realisticvillagers.manager.revive.ReviveManager.onVillagerRemove(ReviveManager.java:147) ~[RealisticVillagers-3.3.6.4.jar:?]
at co.aikar.timings.TimedEventExecutor.execute(TimedEventExecutor.java:80) ~[paper-api-1.21.10-R0.1-SNAPSHOT.jar:?]
at org.bukkit.plugin.RegisteredListener.callEvent(RegisteredListener.java:71) ~[paper-api-1.21.10-R0.1-SNAPSHOT.jar:?]
at io.papermc.paper.plugin.manager.PaperEventManager.callEvent(PaperEventManager.java:54) ~[paper-1.21.10.jar:1.21.10-129-3e25649]
at io.papermc.paper.plugin.manager.PaperPluginManagerImpl.callEvent(PaperPluginManagerImpl.java:131) ~[paper-1.21.10.jar:1.21.10-129-3e25649]
at org.bukkit.plugin.SimplePluginManager.callEvent(SimplePluginManager.java:628) ~[paper-api-1.21.10-R0.1-SNAPSHOT.jar:?]
at RealisticVillagers-3.3.6.4.jar/me.matsubara.realisticvillagers.entity.v1_21_10.WanderingTraderNPC.onRemoval(WanderingTraderNPC.java:603) ~[RealisticVillagers-3.3.6.4.jar:?]
at net.minecraft.world.entity.Entity.setRemoved(Entity.java:5173) ~[paper-1.21.10.jar:1.21.10-129-3e25649]
at net.minecraft.world.entity.Entity.remove(Entity.java:721) ~[paper-1.21.10.jar:1.21.10-129-3e25649]
at net.minecraft.world.entity.LivingEntity.remove(LivingEntity.java:747) ~[paper-1.21.10.jar:1.21.10-129-3e25649]
at net.minecraft.world.entity.Entity.discard(Entity.java:653) ~[paper-1.21.10.jar:1.21.10-129-3e25649]
at net.minecraft.world.entity.npc.WanderingTrader.maybeDespawn(WanderingTrader.java:223) ~[paper-1.21.10.jar:1.21.10-129-3e25649]
at net.minecraft.world.entity.npc.WanderingTrader.aiStep(WanderingTrader.java:217) ~[paper-1.21.10.jar:1.21.10-129-3e25649]
at net.minecraft.world.entity.LivingEntity.tick(LivingEntity.java:3307) ~[paper-1.21.10.jar:1.21.10-129-3e25649]
at net.minecraft.world.entity.Mob.tick(Mob.java:392) ~[paper-1.21.10.jar:1.21.10-129-3e25649]
at net.minecraft.server.level.ServerLevel.tickNonPassenger(ServerLevel.java:1316) ~[paper-1.21.10.jar:1.21.10-129-3e25649]
at net.minecraft.world.level.Level.guardEntityTick(Level.java:1434) ~[paper-1.21.10.jar:1.21.10-129-3e25649]
at net.minecraft.server.level.ServerLevel.lambda$tick$4(ServerLevel.java:839) ~[paper-1.21.10.jar:1.21.10-129-3e25649]
at net.minecraft.world.level.entity.EntityTickList.forEach(EntityTickList.java:39) ~[paper-1.21.10.jar:1.21.10-129-3e25649]
at net.minecraft.server.level.ServerLevel.tick(ServerLevel.java:821) ~[paper-1.21.10.jar:1.21.10-129-3e25649]
at net.minecraft.server.MinecraftServer.tickChildren(MinecraftServer.java:1807) ~[paper-1.21.10.jar:1.21.10-129-3e25649]
at net.minecraft.server.MinecraftServer.tickServer(MinecraftServer.java:1618) ~[paper-1.21.10.jar:1.21.10-129-3e25649]
at net.minecraft.server.dedicated.DedicatedServer.tickServer(DedicatedServer.java:430) ~[paper-1.21.10.jar:1.21.10-129-3e25649]
at net.minecraft.server.MinecraftServer.runServer(MinecraftServer.java:1338) ~[paper-1.21.10.jar:1.21.10-129-3e25649]
at net.minecraft.server.MinecraftServer.lambda$spin$2(MinecraftServer.java:384) ~[paper-1.21.10.jar:1.21.10-129-3e25649]
at java.base/java.lang.Thread.run(Thread.java:1474) ~[?:?]

[t3hw00t]

ChatGPT fix, needs some more testing:

@OverRide
public String getNPCTag(LivingEntity entity, boolean isInfection) {
if (entity instanceof ZombieVillager) {
PersistentDataContainer container = entity.getPersistentDataContainer();
return container.getOrDefault(plugin.getZombieTransformKey(), PersistentDataType.STRING, "");
}

Optional<IVillagerNPC> optional = getNPC(entity);
if (optional.isEmpty()) return null;

IVillagerNPC npc = optional.get();
if (npc instanceof VillagerNPC villager) {
    villager.setWasInfected(isInfection);
}

if (npc.getOffline() instanceof OfflineVillagerNPC offline) {
    PersistentDataContainer container = entity.getPersistentDataContainer();
    byte[] primitive = RealisticVillagers.VILLAGER_DATA.toPrimitive(
            offline.toOfflineDataWrapper(),
            container.getAdapterContext());
    return Base64.getEncoder().encodeToString(primitive);
}
return null;

}