mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-17 08:27:43 +01:00
Updated Upstream (Paper)
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@6520ca1 Fix main thread priority being lowered (#9488) PaperMC/Paper@47b805f Don't let player loot if reloot time is disabled (#9615) PaperMC/Paper@73af2d4 Add clicked position to PlayerUseUnknownEntityEvent (#9604) PaperMC/Paper@ea1f33c Delete patch to fix PaperMC/Paper#9612 (#9621) PaperMC/Paper@307d05b Count down radius-aware dependency tree node parents (#9600) PaperMC/Paper@eb8f2bb Fix unknown entity interaction clicked position getter if null PaperMC/Paper@fd4f0c7 API for an entity's scoreboard name (#9462) PaperMC/Paper@2bd6ba2 Deprecate and replace methods using deprecated StructureType (#8643) PaperMC/Paper@666a214 [ci skip] rebuild patches
This commit is contained in:
@@ -22,13 +22,13 @@ index b7a2cecb334ce39fa09d8ab949a29eedbdc44c36..6f55ccfff74b361854bf424fd93f0428
|
||||
* @deprecated removed in 1.16
|
||||
*/
|
||||
diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
|
||||
index 6b842453589cf148ab32c1507cf374056826316e..84000002d89c0fb692d1c44f449ad3dcdd2b7576 100644
|
||||
index 75664470303a6e0cbd393c0db32b78b3af818cb6..f4a614f1a1df3a6a6a9edefec9ac81b14476727e 100644
|
||||
--- a/src/main/java/org/bukkit/entity/Entity.java
|
||||
+++ b/src/main/java/org/bukkit/entity/Entity.java
|
||||
@@ -965,4 +965,35 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
|
||||
@@ -976,4 +976,35 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
|
||||
*/
|
||||
@NotNull io.papermc.paper.threadedregions.scheduler.EntityScheduler getScheduler();
|
||||
// Paper end - Folia schedulers
|
||||
@NotNull String getScoreboardEntryName();
|
||||
// Paper end - entity scoreboard name
|
||||
+
|
||||
+ // Purpur start
|
||||
+ /**
|
||||
|
||||
Reference in New Issue
Block a user