71c84c8132
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: 9a80d38c SPIGOT-336, SPIGOT-3366, SPIGOT-5768, SPIGOT-6409, SPIGOT-6861, PR-722: Add EntityRemoveEvent 258086d9 SPIGOT-7417, PR-967: Add Sign#getTargetSide and Sign#getAllowedEditor ffaba051 SPIGOT-7584: Add missing Tag.ITEMS_NON_FLAMMABLE_WOOD CraftBukkit Changes: 98b6c1ac7 SPIGOT-7589 Fix NullPointerException when bans expire a2736ddb0 SPIGOT-336, SPIGOT-3366, SPIGOT-5768, SPIGOT-6409, SPIGOT-6861, PR-1008: Add EntityRemoveEvent 5bf12cb89 SPIGOT-7565: Throw a more descriptive error message when a developer tries to spawn an entity from a CraftBukkit class 76d95fe7e SPIGOT-7417, PR-1343: Add Sign#getTargetSide and Sign#getAllowedEditor Spigot Changes: e9ec5485 Rebuild patches f1b62e0c Rebuild patches
61 Zeilen
2.2 KiB
Diff
61 Zeilen
2.2 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 082601f349ae2cebbffd1012c19c521241696a09..3dafdf14ced991ae1179ef1ca455da62f8c3243e 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, Enemy {
|
|
*/
|
|
@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
|
|
}
|