Commits

Doc authored and md_5 committed 21d34ea4715
SPIGOT-7997: Cancelling EntityTransformEvent does not reset StrayConversionTime
No tags

nms-patches/net/minecraft/world/entity/monster/EntitySkeleton.patch

Modified
1 1 --- a/net/minecraft/world/entity/monster/EntitySkeleton.java
2 2 +++ b/net/minecraft/world/entity/monster/EntitySkeleton.java
3 -@@ -99,7 +99,7 @@
3 +@@ -94,12 +94,17 @@
4 + }
5 +
6 + protected void doFreezeConversion() {
7 +- this.convertTo(EntityTypes.STRAY, ConversionParams.single(this, true, true), (entityskeletonstray) -> {
8 ++ net.minecraft.world.entity.monster.EntitySkeletonStray converted = this.convertTo(EntityTypes.STRAY, ConversionParams.single(this, true, true), (entityskeletonstray) -> { // CraftBukkit
9 + if (!this.isSilent()) {
4 10 this.level().levelEvent((EntityHuman) null, 1048, this.blockPosition(), 0);
5 11 }
6 12
7 13 - });
8 -+ }, org.bukkit.event.entity.EntityTransformEvent.TransformReason.FROZEN, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.FROZEN); // CraftBukkit - add spawn and transform reasons
14 ++ // CraftBukkit start
15 ++ }, org.bukkit.event.entity.EntityTransformEvent.TransformReason.FROZEN, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.FROZEN);
16 ++ if (converted == null) {
17 ++ ((org.bukkit.entity.Skeleton) getBukkitEntity()).setConversionTime(-1); // CraftBukkit - SPIGOT-7997: End conversion to stop event spam
18 ++ }
19 ++ // CraftBukkit end
9 20 }
10 21
11 22 @Override

Everything looks good. We'll let you know here if there's anything you should know about.

Add shortcut