mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-17 16:37:43 +01:00
1db35b2449
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@3c41f8f Cache map ids on item frames (#9584) PaperMC/Paper@3b4839e Fix players are invisible after using setPlayerProfile (#9143) PaperMC/Paper@20a71c5 Add restrict-player-reloot-time config (#7652) PaperMC/Paper@29aaf7b Fix custom statistic criteria creation (#9595) PaperMC/Paper@2df309b Bandaid fix for Effect (#9548) PaperMC/Paper@1dfdbef SculkCatalyst bloom API (#9466) PaperMC/Paper@02338e5 Fix DEFAULT getEntitySpawnReason for /summon (#9480) PaperMC/Paper@23c44c2 [ci skip] Update README
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 42624ec551509e565f6c0c0b4cc5b4c7ba1f1575..43448b96b5261e11bfb284e1efe726eb3e9cbeee 100644
|
|
--- a/src/main/java/org/bukkit/entity/Player.java
|
|
+++ b/src/main/java/org/bukkit/entity/Player.java
|
|
@@ -3272,5 +3272,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
|
|
}
|