mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-17 16:37:43 +01:00
635d108ae2
Upstream has released updates that appear to apply and compile correctly Paper Changes:415f7ca165Updated Upstream (Bukkit/CraftBukkit)37df95b189refactor: do not import List; use FQN5c65546f5crebasefdef125b19Expose EntityType#getTranslationKey4d9b14efa4Use AsyncAppender instead of AsyncLoggerContextSelector to keep loggging IO off main thread (#6381)8c2adf8e9eAdd warning to getOfflinePlayers (#6365)370b60de14Optimize indirect passenger iteration (#6366)80836709e7Fix block drops position losing precision millions of blocks out (#6387)e942509e73Updated Upstream (Bukkit/CraftBukkit/Spigot) (#6379)ce43ce8265Make EntityUnleashEvent cancellable (#4993)591cac3685Configurable item frame map cursor interval (#6385)e9aa9ce66bAdd config migration for named entity death logging option (#6390)c2f47a76aeImplement Translatable in appropriate places (#6248)f12a7f57e1Clear bucket NBT after dispense (#6391)4dd33cb8b6[ci skip] Drop "Fix CME on adding a passenger in CreatureSpawnEvent" (#6384)565cd3306c[ci skip] Add some helper methods to the ObfHelper util class (#6374) Tuinity Changes:6fd7e2b376Update paper
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 285c8a5c6991c26e0b9c2b6af252cc1b320a8a2f..702b2cb940fd269c4ddc0c25c7aefd00d014b942 100644
|
|
--- a/src/main/java/org/bukkit/entity/Player.java
|
|
+++ b/src/main/java/org/bukkit/entity/Player.java
|
|
@@ -2319,5 +2319,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
|
|
}
|