[Auto] Updated Upstream (Bukkit/CraftBukkit)

Upstream has released updates that appear to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing

Bukkit Changes:
95ff95ed #588: Add Player#sendBlockDamage()

CraftBukkit Changes:
ea050e6e9 #807: Add Player#sendBlockDamage()
This commit is contained in:
Aikar 2021-02-24 04:32:17 -05:00
parent 6ae2121257
commit ca4c781d83
No known key found for this signature in database
GPG key ID: 401ADFC9891FAAFE
47 changed files with 132 additions and 132 deletions

View file

@ -3375,10 +3375,10 @@ index 2a145d851ce30360aa39549745bd87590c034584..00000000000000000000000000000000
- // Spigot end
-}
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 40345617fd387afe6d2ec7ff7043b3a3538f19f7..f22b21ee12496452f7b2125c131f56ecc74d439a 100644
index eaf5d55d10f6828b7d0a06ff38c00ddd0b6ec103..0e05b09fc05ccd0a5dabb658dc62e336b204a127 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -1391,7 +1391,14 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -1402,7 +1402,14 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
*/
public void sendMessage(@NotNull net.md_5.bungee.api.ChatMessageType position, @Nullable UUID sender, @NotNull net.md_5.bungee.api.chat.BaseComponent... components) {
throw new UnsupportedOperationException("Not supported yet.");

View file

@ -895,7 +895,7 @@ index 344c14a5ed86e9ebe401bfb5ba3aedc0c0ed0b04..41a1bc45cc5eb7f19374115ade7f5328
+ // Paper end
}
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index f22b21ee12496452f7b2125c131f56ecc74d439a..4ff2800d4439c0179e94820c96955b291b0a6dec 100644
index 0e05b09fc05ccd0a5dabb658dc62e336b204a127..e4d1d95dda8cdefb9056aa688bd8507602502dd0 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -30,7 +30,28 @@ import org.jetbrains.annotations.Nullable;
@ -1068,7 +1068,7 @@ index f22b21ee12496452f7b2125c131f56ecc74d439a..4ff2800d4439c0179e94820c96955b29
/**
* Says a message (or runs a command).
*
@@ -437,6 +518,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -448,6 +529,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@Deprecated
public boolean sendChunkChange(@NotNull Location loc, int sx, int sy, int sz, @NotNull byte[] data);
@ -1076,7 +1076,7 @@ index f22b21ee12496452f7b2125c131f56ecc74d439a..4ff2800d4439c0179e94820c96955b29
/**
* Send a sign change. This fakes a sign change packet for a user at
* a certain location. This will not actually change the world in any way.
@@ -452,6 +534,43 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -463,6 +545,43 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* @throws IllegalArgumentException if location is null
* @throws IllegalArgumentException if lines is non-null and has a length less than 4
*/
@ -1120,7 +1120,7 @@ index f22b21ee12496452f7b2125c131f56ecc74d439a..4ff2800d4439c0179e94820c96955b29
public void sendSignChange(@NotNull Location loc, @Nullable String[] lines) throws IllegalArgumentException;
@@ -471,7 +590,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -482,7 +601,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* @throws IllegalArgumentException if location is null
* @throws IllegalArgumentException if dyeColor is null
* @throws IllegalArgumentException if lines is non-null and has a length less than 4
@ -1130,7 +1130,7 @@ index f22b21ee12496452f7b2125c131f56ecc74d439a..4ff2800d4439c0179e94820c96955b29
public void sendSignChange(@NotNull Location loc, @Nullable String[] lines, @NotNull DyeColor dyeColor) throws IllegalArgumentException;
/**
@@ -1258,6 +1379,14 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -1269,6 +1390,14 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
*/
public int getClientViewDistance();
@ -1145,7 +1145,7 @@ index f22b21ee12496452f7b2125c131f56ecc74d439a..4ff2800d4439c0179e94820c96955b29
/**
* Gets the player's current locale.
*
@@ -1268,8 +1397,10 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -1279,8 +1408,10 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* they wish.
*
* @return the player's locale
@ -1156,7 +1156,7 @@ index f22b21ee12496452f7b2125c131f56ecc74d439a..4ff2800d4439c0179e94820c96955b29
public String getLocale();
/**
@@ -1287,6 +1418,14 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -1298,6 +1429,14 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
*/
public void openBook(@NotNull ItemStack book);
@ -1171,7 +1171,7 @@ index f22b21ee12496452f7b2125c131f56ecc74d439a..4ff2800d4439c0179e94820c96955b29
// Spigot start
public class Spigot extends Entity.Spigot {
@@ -1341,11 +1480,13 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -1352,11 +1491,13 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
throw new UnsupportedOperationException("Not supported yet.");
}
@ -1185,7 +1185,7 @@ index f22b21ee12496452f7b2125c131f56ecc74d439a..4ff2800d4439c0179e94820c96955b29
@Override
public void sendMessage(@NotNull net.md_5.bungee.api.chat.BaseComponent... components) {
throw new UnsupportedOperationException("Not supported yet.");
@@ -1356,7 +1497,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -1367,7 +1508,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
*
* @param position the screen position
* @param component the components to send
@ -1195,7 +1195,7 @@ index f22b21ee12496452f7b2125c131f56ecc74d439a..4ff2800d4439c0179e94820c96955b29
public void sendMessage(@NotNull net.md_5.bungee.api.ChatMessageType position, @NotNull net.md_5.bungee.api.chat.BaseComponent component) {
throw new UnsupportedOperationException("Not supported yet.");
}
@@ -1366,7 +1509,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -1377,7 +1520,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
*
* @param position the screen position
* @param components the components to send
@ -1205,7 +1205,7 @@ index f22b21ee12496452f7b2125c131f56ecc74d439a..4ff2800d4439c0179e94820c96955b29
public void sendMessage(@NotNull net.md_5.bungee.api.ChatMessageType position, @NotNull net.md_5.bungee.api.chat.BaseComponent... components) {
throw new UnsupportedOperationException("Not supported yet.");
}
@@ -1377,7 +1522,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -1388,7 +1533,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* @param position the screen position
* @param sender the sender of the message
* @param component the components to send
@ -1215,7 +1215,7 @@ index f22b21ee12496452f7b2125c131f56ecc74d439a..4ff2800d4439c0179e94820c96955b29
public void sendMessage(@NotNull net.md_5.bungee.api.ChatMessageType position, @Nullable UUID sender, @NotNull net.md_5.bungee.api.chat.BaseComponent component) {
throw new UnsupportedOperationException("Not supported yet.");
}
@@ -1388,7 +1535,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -1399,7 +1546,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* @param position the screen position
* @param sender the sender of the message
* @param components the components to send

View file

@ -5,10 +5,10 @@ Subject: [PATCH] Player affects spawning API
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 27d3f303fcd0d5a85e1ef3de7f0e1e819360e0f8..b797d130f3e72f9ccea2d9f7ff3a600db052c5ab 100644
index e4d1d95dda8cdefb9056aa688bd8507602502dd0..671f9eff01a46a1cacdb76a87b93e090d78329b3 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -1403,6 +1403,22 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -1414,6 +1414,22 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@Deprecated // Paper
public String getLocale();

View file

@ -5,10 +5,10 @@ Subject: [PATCH] Add player view distance API
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index b797d130f3e72f9ccea2d9f7ff3a600db052c5ab..38f93227acc5a606dd900c5e293e2fcd05f34f72 100644
index 671f9eff01a46a1cacdb76a87b93e090d78329b3..68795a48cb15d322906ce0569b7701231c1f94c2 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -1417,6 +1417,28 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -1428,6 +1428,28 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* @param affects Whether the player can affect mob spawning
*/
public void setAffectsSpawning(boolean affects);

View file

@ -76,10 +76,10 @@ index 7e4a728ceb943b6a32b9ba9b84bada34e71c0980..9ce9b4ce2da6c57c62607502ae2042e3
* Gets the name of the update folder. The update folder is used to safely
* update plugins at the right moment on a plugin load.
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 38f93227acc5a606dd900c5e293e2fcd05f34f72..8e2ba76fceccc1b3f543d8e88077c8c82497abb1 100644
index 68795a48cb15d322906ce0569b7701231c1f94c2..88853cc165c67fd60a0a8f87e4ce356e4ca045f9 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -603,6 +603,42 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -614,6 +614,42 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
*/
public void sendMap(@NotNull MapView map);

View file

@ -432,7 +432,7 @@ index 0000000000000000000000000000000000000000..9e90c3df567a65b48a0b9341f784eb90
+ }
+}
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 8e2ba76fceccc1b3f543d8e88077c8c82497abb1..18596641c8d001f574f55e8f20f51d2168d1f3bc 100644
index 88853cc165c67fd60a0a8f87e4ce356e4ca045f9..c9e4cb2d153fc0c6853fe520263a0073e7504e38 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -2,6 +2,7 @@ package org.bukkit.entity;
@ -443,7 +443,7 @@ index 8e2ba76fceccc1b3f543d8e88077c8c82497abb1..18596641c8d001f574f55e8f20f51d21
import org.bukkit.DyeColor;
import org.bukkit.Effect;
import org.bukkit.GameMode;
@@ -637,6 +638,131 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -648,6 +649,131 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
public default void sendMessage(net.md_5.bungee.api.ChatMessageType position, net.md_5.bungee.api.chat.BaseComponent... components) {
spigot().sendMessage(position, components);
}

View file

@ -5,10 +5,10 @@ Subject: [PATCH] Complete resource pack API
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index f6a8feccd9a9ef5f77454a545a2b07b7ff9a79a8..cebf5217075bf9ca91048f93b20598e971405b84 100644
index c9e4cb2d153fc0c6853fe520263a0073e7504e38..d1b7b0d24f15753337e211328771b3cba47bca18 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -1162,7 +1162,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -1173,7 +1173,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* @throws IllegalArgumentException Thrown if the URL is null.
* @throws IllegalArgumentException Thrown if the URL is too long. The
* length restriction is an implementation specific arbitrary value.
@ -18,7 +18,7 @@ index f6a8feccd9a9ef5f77454a545a2b07b7ff9a79a8..cebf5217075bf9ca91048f93b20598e9
public void setResourcePack(@NotNull String url);
/**
@@ -1624,6 +1626,60 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -1635,6 +1637,60 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
default net.kyori.adventure.text.event.HoverEvent<net.kyori.adventure.text.event.HoverEvent.ShowEntity> asHoverEvent(final @NotNull java.util.function.UnaryOperator<net.kyori.adventure.text.event.HoverEvent.ShowEntity> op) {
return net.kyori.adventure.text.event.HoverEvent.showEntity(op.apply(net.kyori.adventure.text.event.HoverEvent.ShowEntity.of(this.getType().getKey(), this.getUniqueId(), this.displayName())));
}

View file

@ -5,7 +5,7 @@ Subject: [PATCH] Add String based Action Bar API
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 4847d7de73a483f3d0eeed9297847c0b71126beb..7e0804e74daa965af09c1c030c55e7c47a1047bb 100644
index d1b7b0d24f15753337e211328771b3cba47bca18..3f68baef538098d9ce66b91195b6fa17f26f0d78 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -3,6 +3,7 @@ package org.bukkit.entity;
@ -16,7 +16,7 @@ index 4847d7de73a483f3d0eeed9297847c0b71126beb..7e0804e74daa965af09c1c030c55e7c4
import org.bukkit.DyeColor;
import org.bukkit.Effect;
import org.bukkit.GameMode;
@@ -605,6 +606,39 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -616,6 +617,39 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
public void sendMap(@NotNull MapView map);
// Paper start
@ -56,7 +56,7 @@ index 4847d7de73a483f3d0eeed9297847c0b71126beb..7e0804e74daa965af09c1c030c55e7c4
/**
* Sends the component to the player
*
@@ -632,9 +666,11 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -643,9 +677,11 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
/**
* Sends an array of components as a single message to the specified screen position of this player
*
@ -68,7 +68,7 @@ index 4847d7de73a483f3d0eeed9297847c0b71126beb..7e0804e74daa965af09c1c030c55e7c4
public default void sendMessage(net.md_5.bungee.api.ChatMessageType position, net.md_5.bungee.api.chat.BaseComponent... components) {
spigot().sendMessage(position, components);
}
@@ -1751,6 +1787,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -1762,6 +1798,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
/**
* Sends the component to the specified screen position of this player
*
@ -76,7 +76,7 @@ index 4847d7de73a483f3d0eeed9297847c0b71126beb..7e0804e74daa965af09c1c030c55e7c4
* @param position the screen position
* @param component the components to send
* @deprecated use {@code sendMessage} methods that accept {@link net.kyori.adventure.text.Component}
@@ -1763,6 +1800,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -1774,6 +1811,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
/**
* Sends an array of components as a single message to the specified screen position of this player
*

View file

@ -6,10 +6,10 @@ Subject: [PATCH] Fix upstream javadoc warnings and errors
Upstream still refuses to use Java 8 with the API so they are likely unaware these are even issues.
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 7e0804e74daa965af09c1c030c55e7c47a1047bb..ecfa4120d03f809a527305c46a2e1d2e863ce14d 100644
index 3f68baef538098d9ce66b91195b6fa17f26f0d78..e71b048e53ee2db4e768eea2ddf19b00a14d2484 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -623,7 +623,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -634,7 +634,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
*
* Use supplied alternative character to the section symbol to represent legacy color codes.
*

View file

@ -10,10 +10,10 @@ of giving the player experience points.
Both an API To standalone mend, and apply mending logic to .giveExp has been added.
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 3edd2fd88d16c5a2a804583cd6f47e9b321821f7..3a8e43a950549a0a77ffe93865a2fef546349d40 100644
index 21bed0d8075335538374fadfdf1cb868e4eebe80..9d1ad67b7d220ab425ac9bf6b1c8d8fb8d5f416c 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -881,12 +881,33 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -892,12 +892,33 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
*/
public void resetPlayerWeather();

View file

@ -6,7 +6,7 @@ Subject: [PATCH] Player.setPlayerProfile API
This can be useful for changing name or skins after a player has logged in.
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 3a8e43a950549a0a77ffe93865a2fef546349d40..da835ee70ea544a72749ef8537af25adafa36d17 100644
index 9d1ad67b7d220ab425ac9bf6b1c8d8fb8d5f416c..6769330f336afcd5f26c0f7286defa00bead543c 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -4,6 +4,7 @@ import java.net.InetSocketAddress;
@ -17,7 +17,7 @@ index 3a8e43a950549a0a77ffe93865a2fef546349d40..da835ee70ea544a72749ef8537af25ad
import org.bukkit.DyeColor;
import org.bukkit.Effect;
import org.bukkit.GameMode;
@@ -1737,6 +1738,20 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -1748,6 +1749,20 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* was {@link org.bukkit.event.player.PlayerResourcePackStatusEvent.Status#SUCCESSFULLY_LOADED}
*/
boolean hasResourcePack();

View file

@ -74,7 +74,7 @@ index 58313929f81509030216a0e5e3869da63e11108e..6cf05fed701c67a2c797a4e0839c7958
/**
* Checks if this player is whitelisted or not
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index da835ee70ea544a72749ef8537af25adafa36d17..80fbfd66973d0c6c7eba245fc3c150a77aee29f5 100644
index 6769330f336afcd5f26c0f7286defa00bead543c..88fd4cdeaad4d27f414c6b268022cdedf73492e7 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -5,6 +5,10 @@ import java.util.UUID;
@ -88,7 +88,7 @@ index da835ee70ea544a72749ef8537af25adafa36d17..80fbfd66973d0c6c7eba245fc3c150a7
import org.bukkit.DyeColor;
import org.bukkit.Effect;
import org.bukkit.GameMode;
@@ -607,6 +611,162 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -618,6 +622,162 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
public void sendMap(@NotNull MapView map);
// Paper start

View file

@ -5,10 +5,10 @@ Subject: [PATCH] Expose attack cooldown methods for Player
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 80fbfd66973d0c6c7eba245fc3c150a77aee29f5..8248d787aefc20d3494c8735aa7c8958b77dc465 100644
index 88fd4cdeaad4d27f414c6b268022cdedf73492e7..3506c4640df9cc61b793a4b934fd41066b9f6572 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -1912,6 +1912,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -1923,6 +1923,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* @param profile The new profile to use
*/
void setPlayerProfile(@NotNull PlayerProfile profile);

View file

@ -176,7 +176,7 @@ index 0000000000000000000000000000000000000000..f7f171c4ee0b8339b2f8fbe82442d65f
+ }
+}
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 8248d787aefc20d3494c8735aa7c8958b77dc465..02d5c62123f319194d84352f076bb141362e9a0e 100644
index 3506c4640df9cc61b793a4b934fd41066b9f6572..ae23c2e2c5f735ea0f8797e4bc9ee7bedb2abf8e 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -2,6 +2,7 @@ package org.bukkit.entity;
@ -187,7 +187,7 @@ index 8248d787aefc20d3494c8735aa7c8958b77dc465..02d5c62123f319194d84352f076bb141
import com.destroystokyo.paper.Title; // Paper
import net.kyori.adventure.text.Component;
import com.destroystokyo.paper.profile.PlayerProfile; // Paper
@@ -1932,6 +1933,12 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -1943,6 +1944,12 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* Reset the cooldown counter to 0, effectively starting the cooldown period.
*/
void resetCooldown();

View file

@ -5,10 +5,10 @@ Subject: [PATCH] Brand support
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 02d5c62123f319194d84352f076bb141362e9a0e..2909e7f2b7062122742e896bcedaf98bfdf1ca26 100644
index ae23c2e2c5f735ea0f8797e4bc9ee7bedb2abf8e..11f0bca3cbc9eac6afb33c2a387ee2f6e2186402 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -2067,6 +2067,16 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -2078,6 +2078,16 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
// Paper end
}

View file

@ -5,10 +5,10 @@ Subject: [PATCH] Player elytra boost API
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 2909e7f2b7062122742e896bcedaf98bfdf1ca26..7dde6c7c6b9449ab4e859ea5611502b4f709808a 100644
index 11f0bca3cbc9eac6afb33c2a387ee2f6e2186402..46eb684a23b1b8321a91f1e70b8196706aebd9bc 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -1939,6 +1939,19 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -1950,6 +1950,19 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
*/
@NotNull
<T> T getClientOption(@NotNull ClientOption<T> option);

View file

@ -5,10 +5,10 @@ Subject: [PATCH] Add sendOpLevel API
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 7dde6c7c6b9449ab4e859ea5611502b4f709808a..a782286c381907dad341ab4985eb774291f5520f 100644
index 46eb684a23b1b8321a91f1e70b8196706aebd9bc..5fe48dcc5a3ea492915350cff44d5f112ce11dbf 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -1952,6 +1952,17 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -1963,6 +1963,17 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
*/
@Nullable
Firework boostElytra(@NotNull ItemStack firework);