2021-06-11 14:02:28 +02:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
2022-08-01 16:01:20 +02:00
|
|
|
From: Nassim Jahnke <nassim@njahnke.dev>
|
2021-06-11 14:02:28 +02:00
|
|
|
Date: Fri, 29 Jan 2021 15:13:11 +0100
|
2024-01-19 13:22:30 +01:00
|
|
|
Subject: [PATCH] Expand EntityUnleashEvent
|
2021-06-11 14:02:28 +02:00
|
|
|
|
|
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
|
2024-01-24 15:57:53 +01:00
|
|
|
index c4b05c7e339a2ec01ee3f5e4dec0b3493788d8d2..8cc40521146d02bbfafbb113dda8183840814c96 100644
|
2021-06-11 14:02:28 +02:00
|
|
|
--- a/src/main/java/net/minecraft/world/entity/Mob.java
|
|
|
|
+++ b/src/main/java/net/minecraft/world/entity/Mob.java
|
2024-01-23 15:43:48 +01:00
|
|
|
@@ -1292,12 +1292,15 @@ public abstract class Mob extends LivingEntity implements Targeting {
|
2021-06-11 14:02:28 +02:00
|
|
|
return InteractionResult.PASS;
|
|
|
|
} else if (this.getLeashHolder() == player) {
|
|
|
|
// CraftBukkit start - fire PlayerUnleashEntityEvent
|
2022-10-02 09:56:36 +02:00
|
|
|
- if (CraftEventFactory.callPlayerUnleashEntityEvent(this, player, hand).isCancelled()) {
|
2024-01-19 22:13:42 +01:00
|
|
|
+ // Paper start - Expand EntityUnleashEvent
|
2022-10-02 09:56:36 +02:00
|
|
|
+ org.bukkit.event.player.PlayerUnleashEntityEvent event = CraftEventFactory.callPlayerUnleashEntityEvent(this, player, hand, !player.getAbilities().instabuild);
|
2021-06-11 14:02:28 +02:00
|
|
|
+ if (event.isCancelled()) {
|
2024-01-19 22:13:42 +01:00
|
|
|
+ // Paper end - Expand EntityUnleashEvent
|
2021-06-11 14:02:28 +02:00
|
|
|
((ServerPlayer) player).connection.send(new ClientboundSetEntityLinkPacket(this, this.getLeashHolder()));
|
|
|
|
return InteractionResult.PASS;
|
|
|
|
}
|
|
|
|
// CraftBukkit end
|
2021-06-14 21:58:32 +02:00
|
|
|
- this.dropLeash(true, !player.getAbilities().instabuild);
|
2024-01-19 22:13:42 +01:00
|
|
|
+ this.dropLeash(true, event.isDropLeash()); // Paper - Expand EntityUnleashEvent
|
2023-03-14 21:25:13 +01:00
|
|
|
this.gameEvent(GameEvent.ENTITY_INTERACT, player);
|
2023-06-08 02:54:54 +02:00
|
|
|
return InteractionResult.sidedSuccess(this.level().isClientSide);
|
2021-06-11 14:02:28 +02:00
|
|
|
} else {
|
2024-01-23 15:43:48 +01:00
|
|
|
@@ -1465,8 +1468,11 @@ public abstract class Mob extends LivingEntity implements Targeting {
|
2021-06-11 14:02:28 +02:00
|
|
|
|
|
|
|
if (this.leashHolder != null) {
|
|
|
|
if (!this.isAlive() || !this.leashHolder.isAlive()) {
|
2023-06-08 02:54:54 +02:00
|
|
|
- this.level().getCraftServer().getPluginManager().callEvent(new EntityUnleashEvent(this.getBukkitEntity(), (!this.isAlive()) ? UnleashReason.PLAYER_UNLEASH : UnleashReason.HOLDER_GONE)); // CraftBukkit
|
2023-12-06 04:00:14 +01:00
|
|
|
- this.dropLeash(true, !this.leashHolder.pluginRemoved);// CraftBukkit - SPIGOT-7487: Don't drop leash, when the holder was removed by a plugin
|
2024-01-19 22:13:42 +01:00
|
|
|
+ // Paper start - Expand EntityUnleashEvent
|
2023-12-06 04:00:14 +01:00
|
|
|
+ EntityUnleashEvent event = new EntityUnleashEvent(this.getBukkitEntity(), (!this.isAlive()) ? EntityUnleashEvent.UnleashReason.PLAYER_UNLEASH : EntityUnleashEvent.UnleashReason.HOLDER_GONE, !this.leashHolder.pluginRemoved);
|
2023-06-08 02:54:54 +02:00
|
|
|
+ this.level().getCraftServer().getPluginManager().callEvent(event); // CraftBukkit
|
2021-06-11 14:02:28 +02:00
|
|
|
+ this.dropLeash(true, event.isDropLeash());
|
2024-01-19 22:13:42 +01:00
|
|
|
+ // Paper end - Expand EntityUnleashEvent
|
2021-06-11 14:02:28 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
}
|
2024-01-23 15:43:48 +01:00
|
|
|
@@ -1529,8 +1535,11 @@ public abstract class Mob extends LivingEntity implements Targeting {
|
2021-06-11 14:02:28 +02:00
|
|
|
boolean flag1 = super.startRiding(entity, force);
|
|
|
|
|
|
|
|
if (flag1 && this.isLeashed()) {
|
2023-06-08 02:54:54 +02:00
|
|
|
- this.level().getCraftServer().getPluginManager().callEvent(new EntityUnleashEvent(this.getBukkitEntity(), UnleashReason.UNKNOWN)); // CraftBukkit
|
2021-06-11 14:02:28 +02:00
|
|
|
- this.dropLeash(true, true);
|
2024-01-19 22:13:42 +01:00
|
|
|
+ // Paper start - Expand EntityUnleashEvent
|
2023-06-08 02:54:54 +02:00
|
|
|
+ EntityUnleashEvent event = new EntityUnleashEvent(this.getBukkitEntity(), EntityUnleashEvent.UnleashReason.UNKNOWN, true);
|
2024-01-19 13:22:30 +01:00
|
|
|
+ if (!event.callEvent()) { return flag1; }
|
2021-06-11 14:02:28 +02:00
|
|
|
+ this.dropLeash(true, event.isDropLeash());
|
2024-01-19 22:13:42 +01:00
|
|
|
+ // Paper end - Expand EntityUnleashEvent
|
2021-06-11 14:02:28 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
return flag1;
|
2024-01-23 15:43:48 +01:00
|
|
|
@@ -1720,8 +1729,11 @@ public abstract class Mob extends LivingEntity implements Targeting {
|
2021-06-11 14:02:28 +02:00
|
|
|
@Override
|
|
|
|
protected void removeAfterChangingDimensions() {
|
|
|
|
super.removeAfterChangingDimensions();
|
2023-06-08 02:54:54 +02:00
|
|
|
- this.level().getCraftServer().getPluginManager().callEvent(new EntityUnleashEvent(this.getBukkitEntity(), UnleashReason.UNKNOWN)); // CraftBukkit
|
2021-06-11 14:02:28 +02:00
|
|
|
- this.dropLeash(true, false);
|
2024-01-19 22:13:42 +01:00
|
|
|
+ // Paper start - Expand EntityUnleashEvent
|
2023-06-08 02:54:54 +02:00
|
|
|
+ EntityUnleashEvent event = new EntityUnleashEvent(this.getBukkitEntity(), EntityUnleashEvent.UnleashReason.UNKNOWN, false);
|
2024-01-19 17:54:05 +01:00
|
|
|
+ this.level().getCraftServer().getPluginManager().callEvent(event); // CraftBukkit
|
2021-06-11 14:02:28 +02:00
|
|
|
+ this.dropLeash(true, event.isDropLeash());
|
2024-01-19 22:13:42 +01:00
|
|
|
+ // Paper end - Expand EntityUnleashEvent
|
2021-06-14 21:58:32 +02:00
|
|
|
this.getAllSlots().forEach((itemstack) -> {
|
2023-06-08 02:54:54 +02:00
|
|
|
if (!itemstack.isEmpty()) {
|
|
|
|
itemstack.setCount(0);
|
2021-06-11 14:02:28 +02:00
|
|
|
diff --git a/src/main/java/net/minecraft/world/entity/PathfinderMob.java b/src/main/java/net/minecraft/world/entity/PathfinderMob.java
|
2024-01-23 15:43:48 +01:00
|
|
|
index 85a9bcbd229b56317c2de15670a04c6d0eb51e18..d6393210cfee53685f83c8491bea8b9c13b01eea 100644
|
2021-06-11 14:02:28 +02:00
|
|
|
--- a/src/main/java/net/minecraft/world/entity/PathfinderMob.java
|
|
|
|
+++ b/src/main/java/net/minecraft/world/entity/PathfinderMob.java
|
2024-01-23 15:43:48 +01:00
|
|
|
@@ -56,8 +56,11 @@ public abstract class PathfinderMob extends Mob {
|
2021-06-11 14:02:28 +02:00
|
|
|
|
|
|
|
if (this instanceof TamableAnimal && ((TamableAnimal) this).isInSittingPose()) {
|
2024-01-19 22:13:42 +01:00
|
|
|
if (f > entity.level().paperConfig().misc.maxLeashDistance) { // Paper - Configurable max leash distance
|
2023-06-08 02:54:54 +02:00
|
|
|
- this.level().getCraftServer().getPluginManager().callEvent(new EntityUnleashEvent(this.getBukkitEntity(), EntityUnleashEvent.UnleashReason.DISTANCE)); // CraftBukkit
|
2021-06-11 14:02:28 +02:00
|
|
|
- this.dropLeash(true, true);
|
2024-01-19 22:13:42 +01:00
|
|
|
+ // Paper start - Expand EntityUnleashEvent
|
2021-06-11 14:02:28 +02:00
|
|
|
+ EntityUnleashEvent event = new EntityUnleashEvent(this.getBukkitEntity(), EntityUnleashEvent.UnleashReason.DISTANCE, true);
|
2024-01-19 17:54:05 +01:00
|
|
|
+ if (!event.callEvent()) return;
|
2021-06-11 14:02:28 +02:00
|
|
|
+ this.dropLeash(true, event.isDropLeash());
|
2024-01-19 22:13:42 +01:00
|
|
|
+ // Paper end - Expand EntityUnleashEvent
|
2021-06-11 14:02:28 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
return;
|
2024-01-23 15:43:48 +01:00
|
|
|
@@ -65,8 +68,11 @@ public abstract class PathfinderMob extends Mob {
|
2021-06-11 14:02:28 +02:00
|
|
|
|
|
|
|
this.onLeashDistance(f);
|
2024-01-19 22:13:42 +01:00
|
|
|
if (f > entity.level().paperConfig().misc.maxLeashDistance) { // Paper - Configurable max leash distance
|
2023-06-08 02:54:54 +02:00
|
|
|
- this.level().getCraftServer().getPluginManager().callEvent(new EntityUnleashEvent(this.getBukkitEntity(), EntityUnleashEvent.UnleashReason.DISTANCE)); // CraftBukkit
|
2021-06-11 14:02:28 +02:00
|
|
|
- this.dropLeash(true, true);
|
2024-01-19 22:13:42 +01:00
|
|
|
+ // Paper start - Expand EntityUnleashEvent
|
2021-06-11 14:02:28 +02:00
|
|
|
+ EntityUnleashEvent event = new EntityUnleashEvent(this.getBukkitEntity(), EntityUnleashEvent.UnleashReason.DISTANCE, true);
|
2024-01-19 17:54:05 +01:00
|
|
|
+ if (!event.callEvent()) return;
|
2021-06-11 14:02:28 +02:00
|
|
|
+ this.dropLeash(true, event.isDropLeash());
|
2024-01-19 22:13:42 +01:00
|
|
|
+ // Paper end - Expand EntityUnleashEvent
|
2021-06-11 14:02:28 +02:00
|
|
|
this.goalSelector.disableControlFlag(Goal.Flag.MOVE);
|
|
|
|
} else if (f > 6.0F) {
|
|
|
|
double d0 = (entity.getX() - this.getX()) / (double) f;
|
|
|
|
diff --git a/src/main/java/net/minecraft/world/entity/decoration/LeashFenceKnotEntity.java b/src/main/java/net/minecraft/world/entity/decoration/LeashFenceKnotEntity.java
|
2024-01-19 22:13:42 +01:00
|
|
|
index 16784fcc853e23689a854e7dc6c03ed8182a164e..006aba8bbb34a0d45ef626a1d299e81909cf9ba1 100644
|
2021-06-11 14:02:28 +02:00
|
|
|
--- a/src/main/java/net/minecraft/world/entity/decoration/LeashFenceKnotEntity.java
|
|
|
|
+++ b/src/main/java/net/minecraft/world/entity/decoration/LeashFenceKnotEntity.java
|
2023-03-14 21:25:13 +01:00
|
|
|
@@ -126,11 +126,14 @@ public class LeashFenceKnotEntity extends HangingEntity {
|
|
|
|
|
|
|
|
if (entityinsentient1.isLeashed() && entityinsentient1.getLeashHolder() == this) {
|
2021-06-11 14:02:28 +02:00
|
|
|
// CraftBukkit start
|
2023-03-14 21:25:13 +01:00
|
|
|
- if (CraftEventFactory.callPlayerUnleashEntityEvent(entityinsentient1, player, hand).isCancelled()) {
|
2024-01-19 22:13:42 +01:00
|
|
|
+ // Paper start - Expand EntityUnleashEvent
|
2023-03-14 21:25:13 +01:00
|
|
|
+ org.bukkit.event.player.PlayerUnleashEntityEvent event = CraftEventFactory.callPlayerUnleashEntityEvent(entityinsentient1, player, hand, !player.getAbilities().instabuild);
|
2021-06-11 14:02:28 +02:00
|
|
|
+ if (event.isCancelled()) {
|
2024-01-19 22:13:42 +01:00
|
|
|
+ // Paper end - Expand EntityUnleashEvent
|
2021-06-11 14:02:28 +02:00
|
|
|
die = false;
|
|
|
|
continue;
|
|
|
|
}
|
2023-03-14 21:25:13 +01:00
|
|
|
- entityinsentient1.dropLeash(true, !player.getAbilities().instabuild); // false -> survival mode boolean
|
2024-01-19 22:13:42 +01:00
|
|
|
+ entityinsentient1.dropLeash(true, event.isDropLeash()); // false -> survival mode boolean // Paper - Expand EntityUnleashEvent
|
2021-06-11 14:02:28 +02:00
|
|
|
// CraftBukkit end
|
2023-03-14 21:25:13 +01:00
|
|
|
flag1 = true;
|
2021-06-11 14:02:28 +02:00
|
|
|
}
|
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
|
2024-01-23 12:06:27 +01:00
|
|
|
index 1e45ca6c042fe86785ac36645e1ce2f5a85a8d23..54b0e6e6c21c02bd6a2a702f6b6416d573f62f9c 100644
|
2021-06-11 14:02:28 +02:00
|
|
|
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
|
|
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
|
Updated Upstream (Bukkit/CraftBukkit) (#10034)
Upstream has released updates that appear to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing
Bukkit Changes:
f29cb801 Separate checkstyle-suppressions file is not required
86f99bbe SPIGOT-7540, PR-946: Add ServerTickManager API
d4119585 SPIGOT-6903, PR-945: Add BlockData#getMapColor
b7a2ed41 SPIGOT-7530, PR-947: Add Player#removeResourcePack
9dd56255 SPIGOT-7527, PR-944: Add WindCharge#explode()
994a6163 Attempt upgrade of resolver libraries
CraftBukkit Changes:
b3b43a6ad Add Checkstyle check for unused imports
13fb3358e SPIGOT-7544: Scoreboard#getEntries() doesn't get entries but class names
3dda99c06 SPIGOT-7540, PR-1312: Add ServerTickManager API
2ab4508c0 SPIGOT-6903, PR-1311: Add BlockData#getMapColor
1dbdbbed4 PR-1238: Remove unnecessary sign ticking
659728d2a MC-264285, SPIGOT-7439, PR-1237: Fix unbreakable flint and steel is completely consumed while igniting creeper
e37e29ce0 Increase outdated build delay
c00438b39 SPIGOT-7530, PR-1313: Add Player#removeResourcePack
492dd80ce SPIGOT-7527, PR-1310: Add WindCharge#explode()
e11fbb9d7 Upgrade MySQL driver
9f3a0bd2a Attempt upgrade of resolver libraries
60d16d7ca PR-1306: Centralize Bukkit and Minecraft entity conversion
Spigot Changes:
06d602e7 Rebuild patches
2023-12-17 03:09:28 +01:00
|
|
|
@@ -1637,8 +1637,10 @@ public class CraftEventFactory {
|
2023-11-11 21:25:45 +01:00
|
|
|
Bukkit.getPluginManager().callEvent(new PlayerRecipeBookSettingsChangeEvent(player.getBukkitEntity(), bukkitType, open, filter));
|
2021-06-11 14:02:28 +02:00
|
|
|
}
|
|
|
|
|
2022-10-02 09:56:36 +02:00
|
|
|
- public static PlayerUnleashEntityEvent callPlayerUnleashEntityEvent(Mob entity, net.minecraft.world.entity.player.Player player, InteractionHand enumhand) {
|
|
|
|
- PlayerUnleashEntityEvent event = new PlayerUnleashEntityEvent(entity.getBukkitEntity(), (Player) player.getBukkitEntity(), CraftEquipmentSlot.getHand(enumhand));
|
2024-01-19 22:13:42 +01:00
|
|
|
+ // Paper start - Expand EntityUnleashEvent
|
2022-10-02 09:56:36 +02:00
|
|
|
+ public static PlayerUnleashEntityEvent callPlayerUnleashEntityEvent(Mob entity, net.minecraft.world.entity.player.Player player, InteractionHand enumhand, boolean dropLeash) {
|
|
|
|
+ PlayerUnleashEntityEvent event = new PlayerUnleashEntityEvent(entity.getBukkitEntity(), (Player) player.getBukkitEntity(), CraftEquipmentSlot.getHand(enumhand), dropLeash);
|
2024-01-19 22:13:42 +01:00
|
|
|
+ // Paper end - Expand EntityUnleashEvent
|
2023-06-08 02:54:54 +02:00
|
|
|
entity.level().getCraftServer().getPluginManager().callEvent(event);
|
2021-06-11 14:02:28 +02:00
|
|
|
return event;
|
|
|
|
}
|