mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-18 00:47:42 +01:00
3d455ff2d5
Upstream has released updates that appear to apply and compile correctly Paper Changes: e4633ca27 [Auto] Updated Upstream (Bukkit/CraftBukkit) a23be44da [Auto] Updated Upstream (CraftBukkit) e40ea889d [CI-SKIP] Deprecate the view distance APIs on Player (#4945) d9fd54e16 Do not crash from invalid ingredient lists in VillagerAcquireTradeEvent 24388381a Fix lead duplication Tuinity Changes: 09423b6 Update to Starlight 0.0.2-RC3 f06591a Update Upstream (Paper) d2aa70f Revert special block lookup for chunksection
38 lines
1.2 KiB
Diff
38 lines
1.2 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
|
|
Date: Sat, 2 May 2020 20:55:31 -0500
|
|
Subject: [PATCH] Player invulnerabilities
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
|
|
index 250b434af848546fa3a6ffd748f03a910095b33d..e398da35bef48b5846d8c66df75b1df11b43e382 100644
|
|
--- a/src/main/java/org/bukkit/entity/Player.java
|
|
+++ b/src/main/java/org/bukkit/entity/Player.java
|
|
@@ -1953,5 +1953,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
|
|
* Reset the idle timer back to 0
|
|
*/
|
|
void resetIdleTimer();
|
|
+
|
|
+ /**
|
|
+ * Check if player is invulnerable from recently spawning or accepting a resource pack
|
|
+ *
|
|
+ * @return True if invulnerable
|
|
+ */
|
|
+ boolean isSpawnInvulnerable();
|
|
+
|
|
+ /**
|
|
+ * Get invulnerable ticks remaining
|
|
+ *
|
|
+ * @return Invulnerable ticks
|
|
+ */
|
|
+ int getSpawnInvulnerableTicks();
|
|
+
|
|
+ /**
|
|
+ * Set invulnerable ticks remaining
|
|
+ *
|
|
+ * @param invulnerableTicks Invulnerable ticks remaining
|
|
+ */
|
|
+ void setSpawnInvulnerableTicks(int invulnerableTicks);
|
|
// Purpur end
|
|
}
|