mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-18 17:07:43 +01:00
cfe8efe1f0
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@26734e8 Updated Upstream (Bukkit/CraftBukkit/Spigot) (#7454) PaperMC/Paper@4a745f9 Optimize Util#sequence (#7115) PaperMC/Paper@2c8d48c Make Panda implement Sittable (#7414) PaperMC/Paper@2c4a589 Fix issues with LimitedRegion (#7343) PaperMC/Paper@3d91eca Fix cancelled snow bucket placement (#6751) PaperMC/Paper@9567753 Don't load plugins prefixed with a dot (#7392) PaperMC/Paper@92c777d Fix PlayerProfile BukkitObject serialization, deprecate setName and setId for removal (#7471) PaperMC/Paper@e6898ff Fix IllegalArgumentException for /paper mobcaps command (#7472) PaperMC/Paper@a8f2d67 - properly fix IllegalArgumentException in `/paper mobcaps` command Pufferfish Changes: pufferfish-gg/Pufferfish@22f20b2 Fix sentry bug
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 75680d1b3bd7640ae9f72ec7b0b794689e7c2cb6..b07e6709531595b7241ef54754f2450d4561c463 100644
|
|
--- a/src/main/java/org/bukkit/entity/Player.java
|
|
+++ b/src/main/java/org/bukkit/entity/Player.java
|
|
@@ -2679,5 +2679,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
|
|
}
|