mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-17 16:37:43 +01:00
08aa4dccaa
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@afa16e6 Modify offline mode warning to include Velocity line (#8812) PaperMC/Paper@de38a45 Add projectile hit simulation API (#8816) PaperMC/Paper@7e7e6b4 More Win Screen API (#8805) PaperMC/Paper@bd77b78 Fix desync of honeycomb when the event is canceled (#8713) PaperMC/Paper@bb05fcf Add missing isFuel Material entries (#8843) PaperMC/Paper@8d1acf6 Call PlayerReadyArrowEvent for when items in the offhand are used (#8842) PaperMC/Paper@f2f9e8c Remove patch that was made obsolete by vanilla (#8847)
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 0226881e26431dded883557f003c2d3a5ced349b..9bbb58d173ab3e0c586273e9135c40184cb5e127 100644
|
|
--- a/src/main/java/org/bukkit/entity/Player.java
|
|
+++ b/src/main/java/org/bukkit/entity/Player.java
|
|
@@ -3027,5 +3027,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
|
|
}
|