mirror of
https://github.com/PaperMC/Paper.git
synced 2024-08-28 23:49:41 +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
61 lines
2.1 KiB
Diff
61 lines
2.1 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: MeFisto94 <MeFisto94@users.noreply.github.com>
|
|
Date: Tue, 11 May 2021 00:48:51 +0200
|
|
Subject: [PATCH] Add a "should burn in sunlight" API for Phantoms and
|
|
Skeletons
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/entity/AbstractSkeleton.java b/src/main/java/org/bukkit/entity/AbstractSkeleton.java
|
|
index 4f4f1e48cdaee0d845f60666569e48731be3fbb9..504fd761e5863c09fe785300a5c3e68e00baf2b0 100644
|
|
--- a/src/main/java/org/bukkit/entity/AbstractSkeleton.java
|
|
+++ b/src/main/java/org/bukkit/entity/AbstractSkeleton.java
|
|
@@ -32,4 +32,24 @@ public interface AbstractSkeleton extends Monster, com.destroystokyo.paper.entit
|
|
@Deprecated
|
|
@Contract("_ -> fail")
|
|
public void setSkeletonType(Skeleton.SkeletonType type);
|
|
+
|
|
+ // Paper start
|
|
+ /**
|
|
+ * Check if this skeleton will burn in the sunlight. This
|
|
+ * does not take into account an entity's natural fire
|
|
+ * immunity.
|
|
+ *
|
|
+ * @return True if skeleton will burn in sunlight
|
|
+ */
|
|
+ boolean shouldBurnInDay();
|
|
+
|
|
+ /**
|
|
+ * Set if this skeleton should burn in the sunlight. This
|
|
+ * will not override an entity's natural fire
|
|
+ * immunity.
|
|
+ *
|
|
+ * @param shouldBurnInDay True to burn in sunlight
|
|
+ */
|
|
+ void setShouldBurnInDay(boolean shouldBurnInDay);
|
|
+ // Paper end
|
|
}
|
|
diff --git a/src/main/java/org/bukkit/entity/Phantom.java b/src/main/java/org/bukkit/entity/Phantom.java
|
|
index ed4d417c2deefb78807cb61b01df5afcd334d754..a40b045f08b85e22e75459b547e7e7c0b95103ed 100644
|
|
--- a/src/main/java/org/bukkit/entity/Phantom.java
|
|
+++ b/src/main/java/org/bukkit/entity/Phantom.java
|
|
@@ -26,5 +26,19 @@ public interface Phantom extends Flying {
|
|
*/
|
|
@Nullable
|
|
public java.util.UUID getSpawningEntity();
|
|
+
|
|
+ /**
|
|
+ * Check if this phantom will burn in the sunlight
|
|
+ *
|
|
+ * @return True if phantom will burn in sunlight
|
|
+ */
|
|
+ public boolean shouldBurnInDay();
|
|
+
|
|
+ /**
|
|
+ * Set if this phantom should burn in the sunlight
|
|
+ *
|
|
+ * @param shouldBurnInDay True to burn in sunlight
|
|
+ */
|
|
+ public void setShouldBurnInDay(boolean shouldBurnInDay);
|
|
// Paper end
|
|
}
|