Updated Upstream (Bukkit/CraftBukkit/Spigot) (#6722)
This commit is contained in:
parent
90f717fa5a
commit
a3dfe6dca5
365 changed files with 725 additions and 732 deletions
|
@ -9,10 +9,10 @@ In Offline Mode, will return an Offline UUID
|
|||
This is a more performant way to obtain a UUID for a name than loading an OfflinePlayer
|
||||
|
||||
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
|
||||
index a903cc8e0fd6f44dc31b8b3998767d24a18f59b6..85cb12d2719ca42c04abcd63726059767bba6fe7 100644
|
||||
index e5515d68b6d69816e29faf1c6d6babe94918b63b..7a5ed3f1ff00ac689f570cd8c02fbd6c7beb7f44 100644
|
||||
--- a/src/main/java/org/bukkit/Bukkit.java
|
||||
+++ b/src/main/java/org/bukkit/Bukkit.java
|
||||
@@ -528,6 +528,20 @@ public final class Bukkit {
|
||||
@@ -550,6 +550,20 @@ public final class Bukkit {
|
||||
return server.getPlayer(id);
|
||||
}
|
||||
|
||||
|
@ -34,10 +34,10 @@ index a903cc8e0fd6f44dc31b8b3998767d24a18f59b6..85cb12d2719ca42c04abcd6372605976
|
|||
* Gets the plugin manager for interfacing with plugins.
|
||||
*
|
||||
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
|
||||
index d1554849a8a0e698d6106487fea44ad8e8b438da..d2fce537c80c73bd1711854fd4b86fb4730e6fe4 100644
|
||||
index d442ba16abfb096817a2be584a596bf6536b070e..87690bd58bdab40edcfddc40b26acc8e1f8cf8fc 100644
|
||||
--- a/src/main/java/org/bukkit/Server.java
|
||||
+++ b/src/main/java/org/bukkit/Server.java
|
||||
@@ -449,6 +449,18 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
|
||||
@@ -470,6 +470,18 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
|
||||
@Nullable
|
||||
public Player getPlayer(@NotNull UUID id);
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue