Updated Upstream (Bukkit/CraftBukkit)

Upstream has released updates that appear to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing

Bukkit Changes:
2b4b6d14 PR-1023: Convert InventoryView to interface

CraftBukkit Changes:
68603b1c1 Use expanded interaction ranges for traced interact events
eae9f760c PR-1414: Convert InventoryView to interface
ee9eafe67 Fix Implementation for DamageSource#isIndirect for internal custom causing entity
This commit is contained in:
Bjarne Koll 2024-06-16 17:21:14 +02:00
parent ec4c712efa
commit e1c0033552
No known key found for this signature in database
GPG key ID: 27F6CCCF55D2EE62
182 changed files with 144 additions and 144 deletions

View file

@ -0,0 +1,83 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Chase Henderson <henderson.chase@gmail.com>
Date: Fri, 5 Jan 2024 03:50:10 -0500
Subject: [PATCH] Add ShulkerDuplicateEvent
diff --git a/src/main/java/io/papermc/paper/event/entity/ShulkerDuplicateEvent.java b/src/main/java/io/papermc/paper/event/entity/ShulkerDuplicateEvent.java
new file mode 100644
index 0000000000000000000000000000000000000000..88d8278e49f1bb32e97ee551d8ad31d4a59534e2
--- /dev/null
+++ b/src/main/java/io/papermc/paper/event/entity/ShulkerDuplicateEvent.java
@@ -0,0 +1,71 @@
+package io.papermc.paper.event.entity;
+
+import org.bukkit.entity.Shulker;
+import org.bukkit.event.Cancellable;
+import org.bukkit.event.HandlerList;
+import org.bukkit.event.entity.EntityEvent;
+import org.jetbrains.annotations.ApiStatus;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * Fired when a shulker duplicates itself by spawning a new shulker.
+ * <p>
+ * The event is fired prior to the newly created shulker, accessible via {@link #getEntity()}, being added to the world.
+ */
+public class ShulkerDuplicateEvent extends EntityEvent implements Cancellable {
+
+ private static final HandlerList HANDLER_LIST = new HandlerList();
+
+ private final Shulker parent;
+ private boolean cancelled;
+
+ @ApiStatus.Internal
+ public ShulkerDuplicateEvent(@NotNull Shulker child, @NotNull Shulker parent) {
+ super(child);
+ this.parent = parent;
+ }
+
+ /**
+ * Provides the newly created shulker, which did not exist prior to the duplication.
+ * At the point of this event, said shulker is not part of the world yet.
+ *
+ * @return the newly duplicated shulker.
+ */
+ @Override
+ @NotNull
+ public Shulker getEntity() {
+ return (Shulker) super.getEntity();
+ }
+
+ /**
+ * Provides the "parent" of the freshly created shulker.
+ * The parent shulker is the one that initiated the duplication.
+ *
+ * @return the previously existing shulker which duplicated.
+ */
+ @NotNull
+ public Shulker getParent() {
+ return this.parent;
+ }
+
+ @Override
+ public boolean isCancelled() {
+ return this.cancelled;
+ }
+
+ @Override
+ public void setCancelled(boolean cancel) {
+ this.cancelled = cancel;
+ }
+
+ @NotNull
+ @Override
+ public HandlerList getHandlers() {
+ return HANDLER_LIST;
+ }
+
+ @NotNull
+ public static HandlerList getHandlerList() {
+ return HANDLER_LIST;
+ }
+}