aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/unapplied/server/0913-Add-ShulkerDuplicateEvent.patch
diff options
context:
space:
mode:
authorNassim Jahnke <[email protected]>2024-12-03 17:58:41 +0100
committerNassim Jahnke <[email protected]>2024-12-03 17:58:41 +0100
commitc0a3d51ab35930e410fcd9752ceaff6c3f581c24 (patch)
treef53076a8b0787d2f544f73f468df94619e5eb1a5 /patches/unapplied/server/0913-Add-ShulkerDuplicateEvent.patch
parentda7138233f6392e791d790d1c3407414c855f9c2 (diff)
downloadPaper-c0a3d51ab35930e410fcd9752ceaff6c3f581c24.tar.gz
Paper-c0a3d51ab35930e410fcd9752ceaff6c3f581c24.zip
Start update, apply API patches
Diffstat (limited to 'patches/unapplied/server/0913-Add-ShulkerDuplicateEvent.patch')
-rw-r--r--patches/unapplied/server/0913-Add-ShulkerDuplicateEvent.patch22
1 files changed, 22 insertions, 0 deletions
diff --git a/patches/unapplied/server/0913-Add-ShulkerDuplicateEvent.patch b/patches/unapplied/server/0913-Add-ShulkerDuplicateEvent.patch
new file mode 100644
index 0000000000..f06c91ae48
--- /dev/null
+++ b/patches/unapplied/server/0913-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 0fffa9dbcbbb15a2138f9a4e4d8e812c8047a7bb..6e0f2f6573ed6be9b91de960d55c269417ad8907 100644
+--- a/src/main/java/net/minecraft/world/entity/monster/Shulker.java
++++ b/src/main/java/net/minecraft/world/entity/monster/Shulker.java
+@@ -492,6 +492,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
+ }
+