mirror of
https://github.com/PaperMC/Paper.git
synced 2024-07-03 18:24:49 +02:00
928bcc8d3a
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: 09943450 Update SnakeYAML version 5515734f SPIGOT-7162: Incorrect description for Entity#getVehicle javadoc 6f82b381 PR-788: Add getHand() to all relevant events CraftBukkit Changes: aaf484f6f SPIGOT-7163: CraftMerchantRecipe doesn't copy demand and specialPrice from BukkitMerchantRecipe 5329dd6fd PR-1107: Add getHand() to all relevant events 93061706e SPIGOT-7045: Ocelots never spawn with babies with spawn reason OCELOT_BABY
82 lines
2.3 KiB
Diff
82 lines
2.3 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Owen1212055 <23108066+Owen1212055@users.noreply.github.com>
|
|
Date: Fri, 19 Mar 2021 23:39:21 -0400
|
|
Subject: [PATCH] Add ElderGuardianAppearanceEvent
|
|
|
|
|
|
diff --git a/src/main/java/io/papermc/paper/event/entity/ElderGuardianAppearanceEvent.java b/src/main/java/io/papermc/paper/event/entity/ElderGuardianAppearanceEvent.java
|
|
new file mode 100644
|
|
index 0000000000000000000000000000000000000000..4cd551c8311ff8f7321ed2dc6a4efc87162dadfe
|
|
--- /dev/null
|
|
+++ b/src/main/java/io/papermc/paper/event/entity/ElderGuardianAppearanceEvent.java
|
|
@@ -0,0 +1,69 @@
|
|
+package io.papermc.paper.event.entity;
|
|
+
|
|
+import org.bukkit.entity.ElderGuardian;
|
|
+import org.bukkit.entity.Entity;
|
|
+import org.bukkit.entity.Player;
|
|
+import org.bukkit.event.Cancellable;
|
|
+import org.bukkit.event.HandlerList;
|
|
+import org.bukkit.event.entity.EntityEvent;
|
|
+import org.jetbrains.annotations.NotNull;
|
|
+
|
|
+import java.util.Collections;
|
|
+import java.util.List;
|
|
+
|
|
+/**
|
|
+ * Is called when an {@link org.bukkit.entity.ElderGuardian} appears in front of a {@link org.bukkit.entity.Player}.
|
|
+ */
|
|
+public class ElderGuardianAppearanceEvent extends EntityEvent implements Cancellable {
|
|
+
|
|
+ private static final HandlerList handlers = new HandlerList();
|
|
+
|
|
+ private boolean cancelled;
|
|
+ private final Player affectedPlayer;
|
|
+
|
|
+ public ElderGuardianAppearanceEvent(@NotNull Entity what, @NotNull Player affectedPlayer) {
|
|
+ super(what);
|
|
+ this.affectedPlayer = affectedPlayer;
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Get the player affected by the guardian appearance.
|
|
+ *
|
|
+ * @return Player affected by the appearance
|
|
+ */
|
|
+ @NotNull
|
|
+ public Player getAffectedPlayer() {
|
|
+ return affectedPlayer;
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * The elder guardian playing the effect.
|
|
+ *
|
|
+ * @return The elder guardian
|
|
+ */
|
|
+ @NotNull
|
|
+ public ElderGuardian getEntity() {
|
|
+ return (ElderGuardian) entity;
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public boolean isCancelled() {
|
|
+ return cancelled;
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public void setCancelled(boolean cancel) {
|
|
+ this.cancelled = cancel;
|
|
+ }
|
|
+
|
|
+ @NotNull
|
|
+ @Override
|
|
+ public HandlerList getHandlers() {
|
|
+ return handlers;
|
|
+ }
|
|
+
|
|
+ @NotNull
|
|
+ public static HandlerList getHandlerList() {
|
|
+ return handlers;
|
|
+ }
|
|
+}
|