Fix leash event for boats and elytra

[harrybridgen]

Fixes #13696

This fix needs testing

[Doc94]

I run this and works.. but i find one case where with Elytra+Rockets and a boat leashed not sure how the leash was cut even with the cancel in true... and the console flood with the message added in the event... but maybe that is another thing...

    @EventHandler
    public void onPlayerUnleashEntityEvent(final PlayerUnleashEntityEvent event) {
        this.getLogger().info("PlayerUnleashEntityEvent");
        this.getLogger().info("event.getPlayer() -> " + event.getPlayer().getName());
        this.getLogger().info("event.getEntity() -> " + event.getEntity().getName());
        event.setCancelled(true);
    }

    @EventHandler
    public void onEntityUnleashEvent(final EntityUnleashEvent event) {
        this.getLogger().info("EntityUnleashEvent");
        this.getLogger().info("event.getReason() -> " + event.getReason());
        this.getLogger().info("event.getEntity() -> " + event.getEntity().getName());
        event.setCancelled(true);
    }

[harrybridgen]

I run this and works.. but i find one case where with Elytra+Rockets and a boat leashed not sure how the leash was cut even with the cancel in true... and the console flood with the message added in the event... but maybe that is another thing...

    @EventHandler
    public void onPlayerUnleashEntityEvent(final PlayerUnleashEntityEvent event) {
        this.getLogger().info("PlayerUnleashEntityEvent");
        this.getLogger().info("event.getPlayer() -> " + event.getPlayer().getName());
        this.getLogger().info("event.getEntity() -> " + event.getEntity().getName());
        event.setCancelled(true);
    }

    @EventHandler
    public void onEntityUnleashEvent(final EntityUnleashEvent event) {
        this.getLogger().info("EntityUnleashEvent");
        this.getLogger().info("event.getReason() -> " + event.getReason());
        this.getLogger().info("event.getEntity() -> " + event.getEntity().getName());
        event.setCancelled(true);
    }

I think I may have found another bug:
In Leashable.java lines 160-167, it doesn't respect if the event was cancelled and removes the leash anyway. I'll update the code to fix this.

[harrybridgen]

@Doc94 Please try your test plugin again, I have pushed a potential fix to the leash breaking even though it was cancelled.

[Lulu13022002]

In Leashable.java lines 160-167, it doesn't respect if the event was cancelled and removes the leash anyway. I'll update the code to fix this.

I think this has been done on purpose see: #4993 and the javadoc of the EntityUnleashEvent

[harrybridgen]

In Leashable.java lines 160-167, it doesn't respect if the event was cancelled and removes the leash anyway. I'll update the code to fix this.

I think this has been done on purpose see: #4993 and the javadoc of the EntityUnleashEvent

You're absolutely right. Thanks for clearing that up. I removed my change, leaving only the original fix.

[kennytv]

I couldn't find what happens when any other entity dies, that might be worth investigating too

[Doc94]

I couldn't find what happens when any other entity dies, that might be worth investigating too

Maybe just call the PLAYER_UNLEASH like here?

i dont find another case... because things like llama despawn or copper golem turn into statue not call the event for notice...

[harrybridgen]

@kennytv @Doc94 I found that in Leashable.java the reason for unleashing in tickLeash was wrong, so I updated it to have the new LEASHED_GONE reason. Line 157 in Leashable.java.

Additionally, I found that when an entity changes dimensions, the unleash reason is UNKNOWN. Maybe we could update this so it has a new CHANGE_DIMENSION reason, or we can use the new LEASHED_GONE reason?

And when a mob starts riding another entity, the unleash reason is also UNKNOWN. Maybe a new STARTED_RIDING reason would work here? Line 1487 in Mob.java.