diff options
| author | Lulu13022002 <[email protected]> | 2024-09-21 21:19:02 +0200 |
|---|---|---|
| committer | GitHub <[email protected]> | 2024-09-21 21:19:02 +0200 |
| commit | 1ed64f82704c299d0f7ae9af710579be995af8de (patch) | |
| tree | 8de9a329fed8373ae5eccc59a9ee9558a53ee3fd /patches/server/0924-Add-ShulkerDuplicateEvent.patch | |
| parent | 593faf4fc3ad433ef523672b6553124dd99f8ca3 (diff) | |
| download | Paper-1ed64f82704c299d0f7ae9af710579be995af8de.tar.gz Paper-1ed64f82704c299d0f7ae9af710579be995af8de.zip | |
Update launchProjectile API (#11300)
Diffstat (limited to 'patches/server/0924-Add-ShulkerDuplicateEvent.patch')
| -rw-r--r-- | patches/server/0924-Add-ShulkerDuplicateEvent.patch | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/patches/server/0924-Add-ShulkerDuplicateEvent.patch b/patches/server/0924-Add-ShulkerDuplicateEvent.patch new file mode 100644 index 0000000000..de864137e2 --- /dev/null +++ b/patches/server/0924-Add-ShulkerDuplicateEvent.patch @@ -0,0 +1,22 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Chase Henderson <[email protected]> +Date: Fri, 5 Jan 2024 03:50:10 -0500 +Subject: [PATCH] Add ShulkerDuplicateEvent + + +diff --git a/src/main/java/net/minecraft/world/entity/monster/Shulker.java b/src/main/java/net/minecraft/world/entity/monster/Shulker.java +index bf58956379d0a5dbfdc34e8626847638b4111433..920c7a92643e83598f39bf984cca430d9deed2cd 100644 +--- a/src/main/java/net/minecraft/world/entity/monster/Shulker.java ++++ b/src/main/java/net/minecraft/world/entity/monster/Shulker.java +@@ -491,6 +491,11 @@ public class Shulker extends AbstractGolem implements VariantHolder<Optional<Dye + if (entityshulker != null) { + entityshulker.setVariant(this.getVariant()); + entityshulker.moveTo(vec3d); ++ // Paper start - Shulker duplicate event ++ if (!new io.papermc.paper.event.entity.ShulkerDuplicateEvent((org.bukkit.entity.Shulker) entityshulker.getBukkitEntity(), (org.bukkit.entity.Shulker) this.getBukkitEntity()).callEvent()) { ++ return; ++ } ++ // Paper end - Shulker duplicate event + this.level().addFreshEntity(entityshulker, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.BREEDING); // CraftBukkit - the mysteries of life + } + |