mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-23 11:06:29 +01:00
57dd397155
Upstream has released updates that appears 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: b999860d SPIGOT-2304: Add LootGenerateEvent CraftBukkit Changes:77fd87e4SPIGOT-2304: Implement LootGenerateEventa1a705eeSPIGOT-5566: Doused campfires & fires should call EntityChangeBlockEvent41712eddSPIGOT-5707: PersistentDataHolder not Persistent on API dropped Item
75 lines
2.2 KiB
Diff
75 lines
2.2 KiB
Diff
From 1f4f38a8c690ff17d12462ffe4661419db8d45b8 Mon Sep 17 00:00:00 2001
|
|
From: BillyGalbreath <Blake.Galbreath@GMail.com>
|
|
Date: Sat, 25 Aug 2018 19:56:42 -0500
|
|
Subject: [PATCH] Add PhantomPreSpawnEvent
|
|
|
|
|
|
diff --git a/src/main/java/com/destroystokyo/paper/event/entity/PhantomPreSpawnEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/PhantomPreSpawnEvent.java
|
|
new file mode 100644
|
|
index 000000000..9022f697a
|
|
--- /dev/null
|
|
+++ b/src/main/java/com/destroystokyo/paper/event/entity/PhantomPreSpawnEvent.java
|
|
@@ -0,0 +1,31 @@
|
|
+package com.destroystokyo.paper.event.entity;
|
|
+
|
|
+import org.bukkit.Location;
|
|
+import org.bukkit.entity.Entity;
|
|
+import org.bukkit.entity.EntityType;
|
|
+import org.bukkit.event.entity.CreatureSpawnEvent;
|
|
+import org.jetbrains.annotations.NotNull;
|
|
+import org.jetbrains.annotations.Nullable;
|
|
+
|
|
+
|
|
+/**
|
|
+ * Called when a phantom is spawned for an exhausted player
|
|
+ */
|
|
+public class PhantomPreSpawnEvent extends PreCreatureSpawnEvent {
|
|
+ @NotNull private final Entity entity;
|
|
+
|
|
+ public PhantomPreSpawnEvent(@NotNull Location location, @NotNull Entity entity, @NotNull CreatureSpawnEvent.SpawnReason reason) {
|
|
+ super(location, EntityType.PHANTOM, reason);
|
|
+ this.entity = entity;
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Get the entity this phantom is spawning for
|
|
+ *
|
|
+ * @return Entity
|
|
+ */
|
|
+ @Nullable
|
|
+ public Entity getSpawningEntity() {
|
|
+ return entity;
|
|
+ }
|
|
+}
|
|
diff --git a/src/main/java/org/bukkit/entity/Phantom.java b/src/main/java/org/bukkit/entity/Phantom.java
|
|
index 1a1044edc..ed4d417c2 100644
|
|
--- a/src/main/java/org/bukkit/entity/Phantom.java
|
|
+++ b/src/main/java/org/bukkit/entity/Phantom.java
|
|
@@ -1,5 +1,8 @@
|
|
package org.bukkit.entity;
|
|
|
|
+import org.jetbrains.annotations.NotNull;
|
|
+import org.jetbrains.annotations.Nullable;
|
|
+
|
|
/**
|
|
* Represents a phantom.
|
|
*/
|
|
@@ -14,4 +17,14 @@ public interface Phantom extends Flying {
|
|
* @param sz The new size of the phantom.
|
|
*/
|
|
public void setSize(int sz);
|
|
+
|
|
+ // Paper start
|
|
+ /**
|
|
+ * Get the UUID of the entity that caused this phantom to spawn
|
|
+ *
|
|
+ * @return UUID
|
|
+ */
|
|
+ @Nullable
|
|
+ public java.util.UUID getSpawningEntity();
|
|
+ // Paper end
|
|
}
|
|
--
|
|
2.26.2
|
|
|