diff options
| author | Riley Park <[email protected]> | 2024-05-15 17:06:59 -0700 |
|---|---|---|
| committer | GitHub <[email protected]> | 2024-05-15 17:06:59 -0700 |
| commit | f17519338bc589c045e0b32bfc37e048b23544d5 (patch) | |
| tree | e50182ec698b4a9de8f366f485ee089b1901bbd9 /patches/server/0947-Add-ShulkerDuplicateEvent.patch | |
| parent | 3fc93581bb876e8149b2ca423375a98f5ca12d27 (diff) | |
| download | Paper-f17519338bc589c045e0b32bfc37e048b23544d5.tar.gz Paper-f17519338bc589c045e0b32bfc37e048b23544d5.zip | |
Expose server build information (#10729)
* Expose server build information
* squash patches
* final tweaks
---------
Co-authored-by: Jake Potrebic <[email protected]>
Co-authored-by: masmc05 <[email protected]>
Diffstat (limited to 'patches/server/0947-Add-ShulkerDuplicateEvent.patch')
| -rw-r--r-- | patches/server/0947-Add-ShulkerDuplicateEvent.patch | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/patches/server/0947-Add-ShulkerDuplicateEvent.patch b/patches/server/0947-Add-ShulkerDuplicateEvent.patch new file mode 100644 index 0000000000..22315c9908 --- /dev/null +++ b/patches/server/0947-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 c1f73e10d8473251425300cedbed2b82da6a79ce..5215fa54666979ef4da074ddfdb082e7274f2957 100644 +--- a/src/main/java/net/minecraft/world/entity/monster/Shulker.java ++++ b/src/main/java/net/minecraft/world/entity/monster/Shulker.java +@@ -485,6 +485,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 + } + |