Skip to content

Fix leash event for boats and elytra #13697

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
harrybridgen wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix leash event for boats and elytra #13697

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions paper-api/src/main/java/org/bukkit/event/entity/EntityUnleashEvent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,10 @@ public enum UnleashReason {
* When the entity's leashholder is more than 10 blocks away
*/
DISTANCE,
/**
* When the leashed entity is removed from the game
*/
LEASHED_GONE,
UNKNOWN;
}
}
2 changes: 1 addition & 1 deletion paper-server/patches/sources/net/minecraft/world/entity/Leashable.java.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
+ // Paper start - Expand EntityUnleashEvent
+ final org.bukkit.event.entity.EntityUnleashEvent event = new org.bukkit.event.entity.EntityUnleashEvent(
+ entity.getBukkitEntity(),
+ !entity.isAlive() ? org.bukkit.event.entity.EntityUnleashEvent.UnleashReason.PLAYER_UNLEASH : org.bukkit.event.entity.EntityUnleashEvent.UnleashReason.HOLDER_GONE,
+ !entity.isAlive() ? org.bukkit.event.entity.EntityUnleashEvent.UnleashReason.LEASHED_GONE : org.bukkit.event.entity.EntityUnleashEvent.UnleashReason.HOLDER_GONE,
+ level.getGameRules().get(GameRules.ENTITY_DROPS) && !entity.pluginRemoved
+ );
+ event.callEvent();
Expand Down
13 changes: 11 additions & 2 deletions paper-server/patches/sources/net/minecraft/world/entity/vehicle/boat/AbstractBoat.java.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,14 +84,23 @@
this.setDeltaMovement(this.getDeltaMovement().multiply(1.0, 0.0, 1.0));
this.lastYd = 0.0;
}
@@ -708,12 +_,12 @@
@@ -708,12 +_,20 @@
}

@Override
- public void remove(Entity.RemovalReason reason) {
+ public void remove(Entity.RemovalReason reason, org.bukkit.event.entity.EntityRemoveEvent.@Nullable Cause eventCause) { // CraftBukkit - add Bukkit remove cause
if (!this.level().isClientSide() && reason.shouldDestroy() && this.isLeashed()) {
this.dropLeash();
- this.dropLeash();
+ // Paper start - Fire EntityUnleashEvent on boat destruction
+ final org.bukkit.event.entity.EntityUnleashEvent event = new org.bukkit.event.entity.EntityUnleashEvent(this.getBukkitEntity(), org.bukkit.event.entity.EntityUnleashEvent.UnleashReason.LEASHED_GONE, true);
+ event.callEvent();
+ if (event.isDropLeash()) {
+ this.dropLeash();
+ } else {
+ this.removeLeash();
+ }
+ // Paper end - Fire EntityUnleashEvent on boat destruction
}

- super.remove(reason);
Expand Down
2 changes: 1 addition & 1 deletion paper-server/patches/sources/net/minecraft/world/item/FireworkRocketItem.java.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
+ com.destroystokyo.paper.event.player.PlayerElytraBoostEvent event = new com.destroystokyo.paper.event.player.PlayerElytraBoostEvent((org.bukkit.entity.Player) player.getBukkitEntity(), org.bukkit.craftbukkit.inventory.CraftItemStack.asCraftMirror(itemInHand), (org.bukkit.entity.Firework) delayed.projectile().getBukkitEntity(), org.bukkit.craftbukkit.CraftEquipmentSlot.getHand(hand));
+ if (event.callEvent() && delayed.attemptSpawn()) {
+ player.awardStat(Stats.ITEM_USED.get(this)); // Moved up from below
+ if (player.dropAllLeashConnections(null)) {
+ if (player.dropAllLeashConnections(player, hand)) { // Paper - PlayerUnleashEntityEvent
+ level.playSound(null, player, SoundEvents.LEAD_BREAK, SoundSource.NEUTRAL, 1.0F, 1.0F);
+ }
+ if (event.shouldConsume() && !player.hasInfiniteMaterials()) {
Expand Down