mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-17 16:37:43 +01:00
7062a32f8f
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@3aec863 Add BlockLockCheckEvent (#7840) PaperMC/Paper@0262de0 Deprecate TargetBlock/EntityInfo and assocated methods (#7381) PaperMC/Paper@28c7d40 Add Sneaking API for Entities (#8485) PaperMC/Paper@262c08f Updated Upstream (CraftBukkit) (#8680)
52 lines
1.8 KiB
Diff
52 lines
1.8 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Racci <90304606+DaRacci@users.noreply.github.com>
|
|
Date: Fri, 4 Feb 2022 16:09:47 +1100
|
|
Subject: [PATCH] Fire Immunity API
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
|
|
index d8f30fca0b5b9673c5dd8a78e87a378c60d04067..8a980916176b2179168833f1d14872176837154e 100644
|
|
--- a/src/main/java/org/bukkit/entity/Entity.java
|
|
+++ b/src/main/java/org/bukkit/entity/Entity.java
|
|
@@ -1007,5 +1007,18 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
|
|
* @return True if in daylight
|
|
*/
|
|
boolean isInDaylight();
|
|
+
|
|
+ /**
|
|
+ * Checks if the entity is fire immune
|
|
+ *
|
|
+ * @return True if fire immune
|
|
+ */
|
|
+ boolean isImmuneToFire();
|
|
+
|
|
+ /**
|
|
+ * Sets if the entity is fire immune
|
|
+ * Set this to null to restore the entity type default
|
|
+ */
|
|
+ void setImmuneToFire(@Nullable Boolean fireImmune);
|
|
// Purpur end
|
|
}
|
|
diff --git a/src/main/java/org/bukkit/entity/Item.java b/src/main/java/org/bukkit/entity/Item.java
|
|
index 05600fc8bf2a61aca8094029bc4c208a710da952..932e65f3aff0d7b15663ef9855b8b74dcb066dd6 100644
|
|
--- a/src/main/java/org/bukkit/entity/Item.java
|
|
+++ b/src/main/java/org/bukkit/entity/Item.java
|
|
@@ -1,6 +1,7 @@
|
|
package org.bukkit.entity;
|
|
|
|
import java.util.UUID;
|
|
+
|
|
import org.bukkit.inventory.ItemStack;
|
|
import org.jetbrains.annotations.NotNull;
|
|
import org.jetbrains.annotations.Nullable;
|
|
@@ -187,7 +188,9 @@ public interface Item extends Entity, io.papermc.paper.entity.Frictional { // Pa
|
|
* Set whether or not this item is immune to fire
|
|
*
|
|
* @param immuneToFire True to make immune to fire
|
|
+ @deprecated use {@link #setImmuneToFire(Boolean)} instead
|
|
*/
|
|
+ @Deprecated
|
|
void setImmuneToFire(boolean immuneToFire);
|
|
|
|
/**
|