diff options
| author | Spottedleaf <[email protected]> | 2024-07-17 10:24:53 -0700 |
|---|---|---|
| committer | Spottedleaf <[email protected]> | 2024-07-17 10:28:32 -0700 |
| commit | 00b949f1bbbf444e2b5e7b8de7c9b14fbd2133c6 (patch) | |
| tree | 82639515bc5e9ae00c1e639e72137ed51e1ac688 /patches/server/0930-Add-ShulkerDuplicateEvent.patch | |
| parent | 967f98aa81da851740aeb429778e46159fd188df (diff) | |
| download | Paper-00b949f1bbbf444e2b5e7b8de7c9b14fbd2133c6.tar.gz Paper-00b949f1bbbf444e2b5e7b8de7c9b14fbd2133c6.zip | |
Remove Moonrise utils to MCUtils, remove duplicated/unused utils
Diffstat (limited to 'patches/server/0930-Add-ShulkerDuplicateEvent.patch')
| -rw-r--r-- | patches/server/0930-Add-ShulkerDuplicateEvent.patch | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/patches/server/0930-Add-ShulkerDuplicateEvent.patch b/patches/server/0930-Add-ShulkerDuplicateEvent.patch new file mode 100644 index 0000000000..de864137e2 --- /dev/null +++ b/patches/server/0930-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 + } + |