fixup previous event

Author: Lulu13022002

paper-api/src/main/java/io/papermc/paper/event/player/PlayerToggleEntityAgeLockEvent.java

@@ -18,16 +18,16 @@ public class PlayerToggleEntityAgeLockEvent extends PlayerEvent implements Cance
     private static final HandlerList HANDLER_LIST = new HandlerList();
 
     private final LivingEntity entity;
-    private final ItemStack itemStack;
+    private final ItemStack item;
     private final EquipmentSlot hand;
     private final boolean ageLocked;
     private boolean cancelled;
 
     @ApiStatus.Internal
-    public PlayerToggleEntityAgeLockEvent(final Player player, final LivingEntity entity, final ItemStack itemStack, final EquipmentSlot hand, final boolean ageLocked) {
+    public PlayerToggleEntityAgeLockEvent(final Player player, final LivingEntity entity, final ItemStack item, final EquipmentSlot hand, final boolean ageLocked) {
         super(player);
         this.entity = entity;
-        this.itemStack = itemStack;
+        this.item = item;
         this.hand = hand;
         this.ageLocked = ageLocked;
     }
@@ -42,8 +42,8 @@ public LivingEntity getEntity() {
     /**
      * {@return the item being used to toggle the age lock of the entity}
      */
-    public ItemStack getItemStack() {
-        return this.itemStack.clone();
+    public ItemStack getItem() {
+        return this.item.clone();
     }
 
     /**
@@ -57,7 +57,7 @@ public EquipmentSlot getHand() {
      * {@return whether the age of the entity is going to be locked or not}
      */
     public boolean isAgeLocked() {
-        return ageLocked;
+        return this.ageLocked;
     }
 
     @Override

paper-server/patches/features/0005-Entity-Activation-Range-2.0.patch

@@ -15,7 +15,7 @@ Adds villagers as separate config
 
 diff --git a/io/papermc/paper/entity/activation/ActivationRange.java b/io/papermc/paper/entity/activation/ActivationRange.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..c18823746ab2edcab536cb1589b7720e3af07e0f
+index 0000000000000000000000000000000000000000..ce6b57eeeeb1bd652f4bb53c19dcfbc05126c7e9
 --- /dev/null
 +++ b/io/papermc/paper/entity/activation/ActivationRange.java
 @@ -0,0 +1,334 @@
@@ -354,7 +354,7 @@ index 0000000000000000000000000000000000000000..c18823746ab2edcab536cb1589b7720e
 +    }
 +}
 diff --git a/net/minecraft/server/level/ServerLevel.java b/net/minecraft/server/level/ServerLevel.java
-index 8c954add1949777b4f5658064eb7cd381d542140..ff0c463a64255af4eb417b8fa84d0ba38397d9fa 100644
+index 96e45eab1e8cf857f5068e911070259866d8bdcb..a0477b407d41ab7391f764b3d21352f410dde9a5 100644
 --- a/net/minecraft/server/level/ServerLevel.java
 +++ b/net/minecraft/server/level/ServerLevel.java
 @@ -857,6 +857,7 @@ public class ServerLevel extends Level implements WorldGenLevel, ServerEntityGet
@@ -415,10 +415,10 @@ index 8c954add1949777b4f5658064eb7cd381d542140..ff0c463a64255af4eb417b8fa84d0ba3
          }
      }
 diff --git a/net/minecraft/world/entity/AgeableMob.java b/net/minecraft/world/entity/AgeableMob.java
-index ed4ccbeaa418e97990770e7e5d663dfeb3488b8c..107729d7a25b64805710b9a2e457cbba62cf00c9 100644
+index 1cca5523edf4052bd3048496d38acd44f19a7c63..9f77fcd1cebf675a90adb55c6ffd34e9c5bc0aa7 100644
 --- a/net/minecraft/world/entity/AgeableMob.java
 +++ b/net/minecraft/world/entity/AgeableMob.java
-@@ -191,6 +191,21 @@ public abstract class AgeableMob extends PathfinderMob {
+@@ -189,6 +189,21 @@ public abstract class AgeableMob extends PathfinderMob {
          super.onSyncedDataUpdated(accessor);
      }
 
@@ -441,7 +441,7 @@ index ed4ccbeaa418e97990770e7e5d663dfeb3488b8c..107729d7a25b64805710b9a2e457cbba
      public void aiStep() {
          super.aiStep();
 diff --git a/net/minecraft/world/entity/AreaEffectCloud.java b/net/minecraft/world/entity/AreaEffectCloud.java
-index 6309a615ba2525437758b1fe39c43060ec42d6f8..677b0cadec2270537d868aac7d0acaf7e6bfa2ea 100644
+index 0df8332933203a904bd9ef9efb3c9bce21e65441..1a502cbd8acea9420fa6dd8d716018b5ede4ba6a 100644
 --- a/net/minecraft/world/entity/AreaEffectCloud.java
 +++ b/net/minecraft/world/entity/AreaEffectCloud.java
 @@ -140,6 +140,16 @@ public class AreaEffectCloud extends Entity implements TraceableEntity {
@@ -462,7 +462,7 @@ index 6309a615ba2525437758b1fe39c43060ec42d6f8..677b0cadec2270537d868aac7d0acaf7
      public void tick() {
          super.tick();
 diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
-index fe197ff989f084b563021ac62984e4710594402e..6a76817b135d5bf1f045c3ff263c3945bdaa8c2d 100644
+index f7b4da570ee28b7128b4d2cd1c67b89e3980bced..93d3fb313d538cc1067b1db010458169a1320122 100644
 --- a/net/minecraft/world/entity/Entity.java
 +++ b/net/minecraft/world/entity/Entity.java
 @@ -382,6 +382,15 @@ public abstract class Entity
@@ -521,7 +521,7 @@ index fe197ff989f084b563021ac62984e4710594402e..6a76817b135d5bf1f045c3ff263c3945
              delta = this.maybeBackOffFromEdge(delta, moverType);
              Vec3 movement = this.collide(delta);
 diff --git a/net/minecraft/world/entity/LivingEntity.java b/net/minecraft/world/entity/LivingEntity.java
-index 9d579b7f17dc38c9e92447ea27ec71a8967a9964..30d518454e7a48b42242184203ab583b19b3e770 100644
+index c4da41f3b5ba6d8492d3776654b1ce62a5015895..6a0ebbdfcc0bc07915574c1cf87463e82213ca7e 100644
 --- a/net/minecraft/world/entity/LivingEntity.java
 +++ b/net/minecraft/world/entity/LivingEntity.java
 @@ -3385,6 +3385,14 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin
@@ -639,7 +639,7 @@ index d46e0e3a4a7fc3bb3f1dd695d4cc563778b99db0..c6e9b155c2341c13d569f28f54f0c1d2
                          }
                      }
 diff --git a/net/minecraft/world/entity/item/ItemEntity.java b/net/minecraft/world/entity/item/ItemEntity.java
-index a4f719c1b1b6a8920068ed8969a9e780420eade1..3791ffa6a14a1b2304780382e19f0e38a59f573f 100644
+index c482c3348267ca2b88109e34291aa860e0cde916..b11b59d80e37d272770ab51a63028fdddfe800d6 100644
 --- a/net/minecraft/world/entity/item/ItemEntity.java
 +++ b/net/minecraft/world/entity/item/ItemEntity.java
 @@ -124,6 +124,29 @@ public class ItemEntity extends Entity implements TraceableEntity {
@@ -757,7 +757,7 @@ index c457a6b0935fa4dce20f93db79c27070ce147705..c9f7e68abccbc6b894a66b675952c973
      public void tick() {
          super.tick();
 diff --git a/net/minecraft/world/entity/projectile/arrow/Arrow.java b/net/minecraft/world/entity/projectile/arrow/Arrow.java
-index 23a9a11f8b9397c91ac610d858b7c1c3810095c8..d8c84e718b9c9d142925e2569afbd72e462bf5ca 100644
+index f3861c936855a0d9c9170585f4da4ce1cd77b854..3b4cbbc4c8ca1cd3110d1d6ba9e3531283b53c08 100644
 --- a/net/minecraft/world/entity/projectile/arrow/Arrow.java
 +++ b/net/minecraft/world/entity/projectile/arrow/Arrow.java
 @@ -70,6 +70,16 @@ public class Arrow extends AbstractArrow {
@@ -816,7 +816,7 @@ index 3a590d4dc980a2912e9cc043d8c8db4cf9d60803..06ab7c48b18c03af494ab10fc2b584ce
 +
  }
 diff --git a/net/minecraft/world/level/Level.java b/net/minecraft/world/level/Level.java
-index 86b37a276b33a10efc950243787e85a657b93138..9a56fc04ad397d962b56e2a3a8fedb8eddeeb89e 100644
+index 2569893356946511fc8c29b51220014519f7bad1..83041532ee49be800c66995ad64d570270349fb6 100644
 --- a/net/minecraft/world/level/Level.java
 +++ b/net/minecraft/world/level/Level.java
 @@ -154,6 +154,12 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl

paper-server/patches/sources/net/minecraft/world/entity/AgeableMob.java.patch

@@ -1,26 +1,14 @@
 --- a/net/minecraft/world/entity/AgeableMob.java
 +++ b/net/minecraft/world/entity/AgeableMob.java
-@@ -68,7 +_,7 @@
+@@ -68,6 +_,11 @@
      protected InteractionResult mobInteract(final Player player, final InteractionHand hand) {
          ItemStack itemInHand = player.getItemInHand(hand);
          if (canUseGoldenDandelion(itemInHand, this.isBaby(), this.ageLockParticleTimer, this)) {
--            setAgeLocked(this, this::isAgeLocked, player, itemInHand, mob -> this.setAgeLockedData());
-+            setAgeLocked(this, this::isAgeLocked, player, itemInHand, mob -> this.setAgeLockedData(), hand); // Paper - toggle entity age lock event - add hand
++            // Paper start - call PlayerToggleEntityAgeLockEvent
++            if (!org.bukkit.craftbukkit.event.CraftEventFactory.callPlayerToggleEntityAgeLockEvent(player, this, itemInHand, hand, !this.isAgeLocked(), AGE_LOCKED)) {
++                return InteractionResult.SUCCESS;
++            }
++            // Paper end - call PlayerToggleEntityAgeLockEvent
+             setAgeLocked(this, this::isAgeLocked, player, itemInHand, mob -> this.setAgeLockedData());
              return InteractionResult.SUCCESS;
          } else {
-             return super.mobInteract(player, hand);
-@@ -87,7 +_,14 @@
- 
-     public static void setAgeLocked(
-         final Mob mob, final Supplier<Boolean> isAgedLocked, final Player player, final ItemStack itemInHand, final Consumer<Mob> setAgeLockData
-+        , final InteractionHand hand // Paper - toggle entity age lock event - add hand
-     ) {
-+        // Paper start - toggle entity age lock event
-+        if (!new io.papermc.paper.event.player.PlayerToggleEntityAgeLockEvent((org.bukkit.entity.Player) player.getBukkitEntity(), mob.getBukkitLivingEntity(), itemInHand.asBukkitCopy(), org.bukkit.craftbukkit.CraftEquipmentSlot.getHand(hand), isAgedLocked.get()).callEvent()) {
-+            player.inventoryMenu.forceHeldSlot(hand);
-+            return;
-+        }
-+        // Paper end - toggle entity age lock event
-         setAgeLockData.accept(mob);
-         itemInHand.consume(1, player);
-         boolean isAgeLocked = isAgedLocked.get();

paper-server/patches/sources/net/minecraft/world/entity/animal/frog/Tadpole.java.patch

@@ -9,15 +9,18 @@
          this.entityData.set(AGE_LOCKED, locked);
      }
 
-@@ -157,7 +_,7 @@
+@@ -157,6 +_,11 @@
              this.feed(player, itemStack);
              return InteractionResult.SUCCESS;
          } else if (AgeableMob.canUseGoldenDandelion(itemStack, true, this.ageLockParticleTimer, this)) {
--            AgeableMob.setAgeLocked(this, this::isAgeLocked, player, itemStack, mob -> this.setAgeLockedData());
-+            AgeableMob.setAgeLocked(this, this::isAgeLocked, player, itemStack, mob -> this.setAgeLockedData(), hand); // Paper - toggle entity age lock event - add hand
++            // Paper start - call PlayerToggleEntityAgeLockEvent
++            if (!org.bukkit.craftbukkit.event.CraftEventFactory.callPlayerToggleEntityAgeLockEvent(player, this, itemStack, hand, !this.isAgeLocked(), AGE_LOCKED)) {
++                return InteractionResult.SUCCESS;
++            }
++            // Paper end - call PlayerToggleEntityAgeLockEvent
+             AgeableMob.setAgeLocked(this, this::isAgeLocked, player, itemStack, mob -> this.setAgeLockedData());
              return InteractionResult.SUCCESS;
          } else {
-             return Bucketable.bucketMobPickup(player, hand, this).orElse(super.mobInteract(player, hand));
 @@ -236,12 +_,17 @@
 
      private void ageUp() {

paper-server/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java

@@ -14,6 +14,7 @@
 import io.papermc.paper.event.connection.PlayerConnectionValidateLoginEvent;
 import io.papermc.paper.event.entity.ItemTransportingEntityValidateTargetEvent;
 import io.papermc.paper.event.player.PlayerBedFailEnterEvent;
+import io.papermc.paper.event.player.PlayerToggleEntityAgeLockEvent;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.EnumMap;
@@ -27,6 +28,7 @@
 import net.minecraft.network.Connection;
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.protocol.game.ServerboundContainerClosePacket;
+import net.minecraft.network.syncher.EntityDataAccessor;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.server.level.ServerPlayer;
@@ -2394,4 +2396,25 @@ public static boolean sendChestLockedNotifications(Vec3 pos) {
         }
         return false;
     }
+
+    public static boolean callPlayerToggleEntityAgeLockEvent(net.minecraft.world.entity.player.Player player, Mob target, ItemStack itemUsed, InteractionHand hand, boolean ageLocked, @Nullable EntityDataAccessor<?> accessorToResync) {
+        PlayerToggleEntityAgeLockEvent event = new PlayerToggleEntityAgeLockEvent(
+            (org.bukkit.entity.Player) player.getBukkitEntity(),
+            (LivingEntity) target.getBukkitEntity(),
+            itemUsed.asBukkitCopy(),
+            org.bukkit.craftbukkit.CraftEquipmentSlot.getHand(hand),
+            ageLocked
+        );
+
+        if (!event.callEvent()) {
+            if (accessorToResync != null && player instanceof ServerPlayer serverPlayer) {
+                target.resendPossiblyDesyncedDataValues(List.of(accessorToResync), serverPlayer);
+            }
+            if (!player.hasInfiniteMaterials()) {
+                player.inventoryMenu.forceHeldSlot(hand);
+            }
+            return false;
+        }
+        return true;
+    }
 }