9
0
mirror of https://github.com/Winds-Studio/Leaf.git synced 2026-01-04 15:41:40 +00:00

Updated Upstream (Gale)

This commit is contained in:
Dreeam
2023-08-25 03:11:14 -04:00
parent 7626a8a505
commit 51aa02c8e3
36 changed files with 271 additions and 397 deletions

View File

@@ -53,10 +53,10 @@ index a736d7bcdc5861a01b66ba36158db1c716339346..22fc165fd9c95f0f3ae1be7a0857e48c
@Override
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index cf5cae753357bbe82d280a5c83800be2bb83f299..fc090ec47cf4ea78e2984b60cebbd486aca5d0d7 100644
index c0d0604e8d5d1ebf3a3d665a55a02ea12416465f..29f2fcfad0f563c3bd500b2ca7d84f453df23798 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -2781,4 +2781,127 @@ public final class Bukkit {
@@ -2823,4 +2823,127 @@ public final class Bukkit {
public static Server.Spigot spigot() {
return server.spigot();
}
@@ -439,10 +439,10 @@ index 9b84cb5abdf3db55cbc7ba19c8cd6955bf4fc5ec..5616d2acfa8180f71ae4123845fc1265
+ // Purpur end - OfflinePlayer API
}
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 093ba28cc5ab0bf5ef4a9198c1231d160713dbe7..38bcfc1e517e7a4b1edccb5c9eba85c853cfc2fe 100644
index 9ff34994f2a4dcf0b10262aacc912d7d283c121e..bd93eb61669a014054cb1ba71f99d74ba8463622 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -2134,6 +2134,18 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -2174,6 +2174,18 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
// Paper end
@@ -461,7 +461,7 @@ index 093ba28cc5ab0bf5ef4a9198c1231d160713dbe7..38bcfc1e517e7a4b1edccb5c9eba85c8
/**
* Sends the component to the player
*
@@ -2443,4 +2455,111 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -2483,4 +2495,111 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
long getLastTickOversleepTime();
// Gale end - YAPFA - last tick time - API
@@ -813,13 +813,13 @@ index 138d2530de2410f4a9424dabd3e5ce0cd1c1dcd2..10a8d64ad2da0be2c14f34c3e7d1957c
// Paper start
/**
diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
index 6b842453589cf148ab32c1507cf374056826316e..af421c1e9ad155e190dc3fe67ed24e96857d9e33 100644
index 762cb07861ca8ff058ce8d57ea6c15df1e588bf3..98de85d1382fe84cdc2e2c9db04bf1b4f157291c 100644
--- a/src/main/java/org/bukkit/entity/Entity.java
+++ b/src/main/java/org/bukkit/entity/Entity.java
@@ -965,4 +965,55 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
@@ -1049,4 +1049,55 @@ 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
+ /**
@@ -1036,10 +1036,10 @@ index bc84b892cae5fe7019a3ad481e9da79956efa1fe..48eb5b00c460cccde29d327cef1d63fc
+ // Purpur end
}
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index da3e990b2e888387736ffda4a6c9165c5d84248e..e6bfe7346d200c569900d3fd96a217d755e0dd0c 100644
index 60df0fd1d3ef021cb6aecd8075a1ae87eac5d9eb..d1025b65d159ad3bf99157570b8b81fdb759ac34 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -3253,4 +3253,143 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -3283,4 +3283,143 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@Override
Spigot spigot();
// Spigot end