mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Updated Upstream (Bukkit/CraftBukkit) (#7022)

Browse source
This commit is contained in:
Jake Potrebic 2021-12-04 23:11:59 -08:00 • committed by GitHub
parent a8e5141f2a
commit fd352861b0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
69 changed files with 281 additions and 247 deletions
Download patch file Download diff file Expand all files Collapse all files

4
patches/api/0006-Timings-v2.patch
View file

@ -3377,10 +3377,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 306e5366d0f07974fa8a344e8a7954b6f7a1ac6f..50fae417ecab61c867a0d2c5299aedf056ff1bec 100644
index 9a864f54992cd0a6987d095ef3b98dd500d0eff9..4a20f96268ea831ed4fdd236b582abdf07dc4748 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -1459,7 +1459,14 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -1469,7 +1469,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.");

46
patches/api/0008-Adventure.patch
View file

@ -1549,10 +1549,10 @@ index 25a6f9313a1953def7470e411b53016f2ca14bef..10cb6088c4618f228c757f4e592b44ed
+ // Paper end
}
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 50fae417ecab61c867a0d2c5299aedf056ff1bec..4d0df67160a3f846cc645a1766305c64d186a43f 100644
index 4a20f96268ea831ed4fdd236b582abdf07dc4748..4f8c4a736c5c78cae66dd76b25d787f0d5d00831 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -34,7 +34,28 @@ import org.jetbrains.annotations.Nullable;
@@ -35,7 +35,28 @@ import org.jetbrains.annotations.Nullable;
/**
* Represents a player, connected or not
*/
@ -1582,7 +1582,7 @@ index 50fae417ecab61c867a0d2c5299aedf056ff1bec..4d0df67160a3f846cc645a1766305c64
/**
* Gets the "friendly" name to display of this player. This may include
@@ -44,7 +65,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -45,7 +66,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* places defined by plugins.
*
* @return the friendly name
@ -1592,7 +1592,7 @@ index 50fae417ecab61c867a0d2c5299aedf056ff1bec..4d0df67160a3f846cc645a1766305c64
@NotNull
public String getDisplayName();
@@ -56,15 +79,50 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -57,15 +80,50 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* places defined by plugins.
*
* @param name The new display name.
@ -1643,7 +1643,7 @@ index 50fae417ecab61c867a0d2c5299aedf056ff1bec..4d0df67160a3f846cc645a1766305c64
public String getPlayerListName();
/**
@@ -73,14 +131,18 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -74,14 +132,18 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* If the value is null, the name will be identical to {@link #getName()}.
*
* @param name new player list name
@ -1662,7 +1662,7 @@ index 50fae417ecab61c867a0d2c5299aedf056ff1bec..4d0df67160a3f846cc645a1766305c64
@Nullable
public String getPlayerListHeader();
@@ -88,7 +150,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -89,7 +151,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* Gets the currently displayed player list footer for this player.
*
* @return player list header or null
@ -1672,7 +1672,7 @@ index 50fae417ecab61c867a0d2c5299aedf056ff1bec..4d0df67160a3f846cc645a1766305c64
@Nullable
public String getPlayerListFooter();
@@ -96,14 +160,18 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -97,14 +161,18 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* Sets the currently displayed player list header for this player.
*
* @param header player list header, null for empty
@ -1691,7 +1691,7 @@ index 50fae417ecab61c867a0d2c5299aedf056ff1bec..4d0df67160a3f846cc645a1766305c64
public void setPlayerListFooter(@Nullable String footer);
/**
@@ -112,7 +180,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -113,7 +181,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
*
* @param header player list header, null for empty
* @param footer player list footer, null for empty
@ -1701,7 +1701,7 @@ index 50fae417ecab61c867a0d2c5299aedf056ff1bec..4d0df67160a3f846cc645a1766305c64
public void setPlayerListHeaderFooter(@Nullable String header, @Nullable String footer);
/**
@@ -150,9 +220,20 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -151,9 +221,20 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* Kicks player with custom kick message.
*
* @param message kick message
@ -1722,7 +1722,7 @@ index 50fae417ecab61c867a0d2c5299aedf056ff1bec..4d0df67160a3f846cc645a1766305c64
/**
* Says a message (or runs a command).
*
@@ -472,6 +553,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -473,6 +554,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
*/
public void sendEquipmentChange(@NotNull LivingEntity entity, @NotNull EquipmentSlot slot, @NotNull ItemStack item);
@ -1749,7 +1749,7 @@ index 50fae417ecab61c867a0d2c5299aedf056ff1bec..4d0df67160a3f846cc645a1766305c64
/**
* 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.
@@ -484,9 +585,75 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -485,9 +586,75 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
*
* @param loc the location of the sign
* @param lines the new text on the sign or null to clear it
@ -1825,7 +1825,7 @@ index 50fae417ecab61c867a0d2c5299aedf056ff1bec..4d0df67160a3f846cc645a1766305c64
public void sendSignChange(@NotNull Location loc, @Nullable String[] lines) throws IllegalArgumentException;
/**
@@ -505,7 +672,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -506,7 +673,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
@ -1835,7 +1835,7 @@ index 50fae417ecab61c867a0d2c5299aedf056ff1bec..4d0df67160a3f846cc645a1766305c64
public void sendSignChange(@NotNull Location loc, @Nullable String[] lines, @NotNull DyeColor dyeColor) throws IllegalArgumentException;
/**
@@ -525,7 +694,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -526,7 +695,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
@ -1845,7 +1845,7 @@ index 50fae417ecab61c867a0d2c5299aedf056ff1bec..4d0df67160a3f846cc645a1766305c64
public void sendSignChange(@NotNull Location loc, @Nullable String[] lines, @NotNull DyeColor dyeColor, boolean hasGlowingText) throws IllegalArgumentException;
/**
@@ -1050,7 +1221,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -1051,7 +1222,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
*
* @param title Title text
* @param subtitle Subtitle text
@ -1854,7 +1854,7 @@ index 50fae417ecab61c867a0d2c5299aedf056ff1bec..4d0df67160a3f846cc645a1766305c64
*/
@Deprecated
public void sendTitle(@Nullable String title, @Nullable String subtitle);
@@ -1069,7 +1240,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -1070,7 +1241,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* @param fadeIn time in ticks for titles to fade in. Defaults to 10.
* @param stay time in ticks for titles to stay. Defaults to 70.
* @param fadeOut time in ticks for titles to fade out. Defaults to 20.
@ -1864,7 +1864,7 @@ index 50fae417ecab61c867a0d2c5299aedf056ff1bec..4d0df67160a3f846cc645a1766305c64
public void sendTitle(@Nullable String title, @Nullable String subtitle, int fadeIn, int stay, int fadeOut);
/**
@@ -1296,6 +1469,14 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -1297,6 +1470,14 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
*/
public int getClientViewDistance();
@ -1879,7 +1879,7 @@ index 50fae417ecab61c867a0d2c5299aedf056ff1bec..4d0df67160a3f846cc645a1766305c64
/**
* Gets the player's estimated ping in milliseconds.
*
@@ -1321,8 +1502,10 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -1322,8 +1503,10 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* they wish.
*
* @return the player's locale
@ -1890,7 +1890,7 @@ index 50fae417ecab61c867a0d2c5299aedf056ff1bec..4d0df67160a3f846cc645a1766305c64
public String getLocale();
/**
@@ -1355,6 +1538,14 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -1365,6 +1548,14 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
*/
public boolean isAllowingServerListings();
@ -1905,7 +1905,7 @@ index 50fae417ecab61c867a0d2c5299aedf056ff1bec..4d0df67160a3f846cc645a1766305c64
// Spigot start
public class Spigot extends Entity.Spigot {
@@ -1409,11 +1600,13 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -1419,11 +1610,13 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
throw new UnsupportedOperationException("Not supported yet.");
}
@ -1919,7 +1919,7 @@ index 50fae417ecab61c867a0d2c5299aedf056ff1bec..4d0df67160a3f846cc645a1766305c64
@Override
public void sendMessage(@NotNull net.md_5.bungee.api.chat.BaseComponent... components) {
throw new UnsupportedOperationException("Not supported yet.");
@@ -1424,7 +1617,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -1434,7 +1627,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
*
* @param position the screen position
* @param component the components to send
@ -1929,7 +1929,7 @@ index 50fae417ecab61c867a0d2c5299aedf056ff1bec..4d0df67160a3f846cc645a1766305c64
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.");
}
@@ -1434,7 +1629,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -1444,7 +1639,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
*
* @param position the screen position
* @param components the components to send
@ -1939,7 +1939,7 @@ index 50fae417ecab61c867a0d2c5299aedf056ff1bec..4d0df67160a3f846cc645a1766305c64
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.");
}
@@ -1445,7 +1642,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -1455,7 +1652,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
@ -1949,7 +1949,7 @@ index 50fae417ecab61c867a0d2c5299aedf056ff1bec..4d0df67160a3f846cc645a1766305c64
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.");
}
@@ -1456,7 +1655,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -1466,7 +1665,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

4
patches/api/0009-Player-affects-spawning-API.patch
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 4d0df67160a3f846cc645a1766305c64d186a43f..eeabecac8920d98c0575d2fbf813ce93bf314f3b 100644
index 4f8c4a736c5c78cae66dd76b25d787f0d5d00831..2338eae12f5a984e953a332b3a5a6700a031dd5a 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -1508,6 +1508,22 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -1509,6 +1509,22 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@Deprecated // Paper
public String getLocale();

4
patches/api/0014-Add-view-distance-API.patch
View file

@ -65,10 +65,10 @@ index c58b1885662c6a234ffee75995051c9750c1a512..7b1fb280a86ab44756fc233b085f878d
public class Spigot {
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index eeabecac8920d98c0575d2fbf813ce93bf314f3b..017872f119721dffb72cffa9f916c1243428b885 100644
index 2338eae12f5a984e953a332b3a5a6700a031dd5a..73c42df406d3935d8eeab2f27f4478f92d2d45d9 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -1522,6 +1522,62 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -1523,6 +1523,62 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* @param affects Whether the player can affect mob spawning
*/
public void setAffectsSpawning(boolean affects);

4
patches/api/0019-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch
View file

@ -76,10 +76,10 @@ index b476f473078512363a7142d82fbc28afaa4690ff..30252583c457a1afafa4172321e13673
* 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 08979f50d125a62d05389da86f08f5ac77e48b11..64557d549dd7d72ec78ecfac324b788657e6a0b4 100644
index 73c42df406d3935d8eeab2f27f4478f92d2d45d9..b6a848261f7c136cbcb4a4f40223d2f248d546c2 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -707,6 +707,42 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -708,6 +708,42 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
*/
public void sendMap(@NotNull MapView map);

4
patches/api/0023-Player-Tab-List-and-Title-APIs.patch
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 64557d549dd7d72ec78ecfac324b788657e6a0b4..12acaa06a00a2a2d0c03e52920bb041af29bc01e 100644
index b6a848261f7c136cbcb4a4f40223d2f248d546c2..1df2ff828aee7dac50d63fe1d51104e9fb2ed264 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 64557d549dd7d72ec78ecfac324b788657e6a0b4..12acaa06a00a2a2d0c03e52920bb041a
import org.bukkit.DyeColor;
import org.bukkit.Effect;
import org.bukkit.GameMode;
@@ -741,6 +742,131 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -742,6 +743,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);
}

6
patches/api/0025-Complete-resource-pack-API.patch
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 d03b4193b3ba1a1a6378fb297e69e4b183f31a03..ad246bc21e9877b70b4e3687d8ae8bcd013b80e3 100644
index 1df2ff828aee7dac50d63fe1d51104e9fb2ed264..9884b8eefea0cc84a1af5901410d77746f85b5d7 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -1250,7 +1250,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -1251,7 +1251,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 d03b4193b3ba1a1a6378fb297e69e4b183f31a03..ad246bc21e9877b70b4e3687d8ae8bcd
public void setResourcePack(@NotNull String url);
/**
@@ -1778,6 +1780,124 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -1788,6 +1790,124 @@ 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())));
}

10
patches/api/0045-Add-String-based-Action-Bar-API.patch
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 ad246bc21e9877b70b4e3687d8ae8bcd013b80e3..757e92e11752e8c244b46a75d5265fa3f11d5a79 100644
index 9884b8eefea0cc84a1af5901410d77746f85b5d7..c89bfe671ec4110951595b5c8c9e91897bcf8e61 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 ad246bc21e9877b70b4e3687d8ae8bcd013b80e3..757e92e11752e8c244b46a75d5265fa3
import org.bukkit.DyeColor;
import org.bukkit.Effect;
import org.bukkit.GameMode;
@@ -709,6 +710,39 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -710,6 +711,39 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
public void sendMap(@NotNull MapView map);
// Paper start
@ -56,7 +56,7 @@ index ad246bc21e9877b70b4e3687d8ae8bcd013b80e3..757e92e11752e8c244b46a75d5265fa3
/**
* Sends the component to the player
*
@@ -736,9 +770,11 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -737,9 +771,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 ad246bc21e9877b70b4e3687d8ae8bcd013b80e3..757e92e11752e8c244b46a75d5265fa3
public default void sendMessage(net.md_5.bungee.api.ChatMessageType position, net.md_5.bungee.api.chat.BaseComponent... components) {
spigot().sendMessage(position, components);
}
@@ -1969,6 +2005,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -1979,6 +2015,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 ad246bc21e9877b70b4e3687d8ae8bcd013b80e3..757e92e11752e8c244b46a75d5265fa3
* @param position the screen position
* @param component the components to send
* @deprecated use {@code sendMessage} methods that accept {@link net.kyori.adventure.text.Component}
@@ -1981,6 +2018,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -1991,6 +2028,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
*

4
patches/api/0054-Fix-upstream-javadocs.patch
View file

@ -76,10 +76,10 @@ index be9334a8b5fba9181ad63c211697e798be63da25..0514a141cb93a650be38c63d4336d46e
* Instructs this Mob to set the specified LivingEntity as its target.
* <p>
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 82e4b89bf280ad3f99d94c9aaa6075449737932a..4771a1537646217ad0836f7d5ed62940339b44c6 100644
index c89bfe671ec4110951595b5c8c9e91897bcf8e61..48b127cafe6fecb1849b176df43cbf26e5a1db79 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -727,7 +727,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -728,7 +728,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
*
* Use supplied alternative character to the section symbol to represent legacy color codes.
*

4
patches/api/0076-Expose-client-protocol-version-and-virtual-host.patch
View file

@ -57,10 +57,10 @@ index 0000000000000000000000000000000000000000..7b2af1bd72dfbcf4e962a982940fc49b
+
+}
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 4771a1537646217ad0836f7d5ed62940339b44c6..a0782b81e787630cb45b38a863f1e98506014735 100644
index 48b127cafe6fecb1849b176df43cbf26e5a1db79..b621f693379aedc23a90b03e724ba8a2ffeb283e 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -36,7 +36,7 @@ import org.jetbrains.annotations.Nullable;
@@ -37,7 +37,7 @@ import org.jetbrains.annotations.Nullable;
/**
* Represents a player, connected or not
*/

4
patches/api/0080-Ability-to-apply-mending-to-XP-API.patch
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 a0782b81e787630cb45b38a863f1e98506014735..8d5ddb1451ea1d7a7a5c9eefb843a4adb885d20e 100644
index b621f693379aedc23a90b03e724ba8a2ffeb283e..1e3a56ff656cdfe18cf665eecd8f126275f29715 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -985,12 +985,33 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -986,12 +986,33 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
*/
public void resetPlayerWeather();

4
patches/api/0091-Player.setPlayerProfile-API.patch
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 fbb7cf6575a129b22fca2eb8ef950e446946ca50..7edb56a95d214f56556e4e83d843879f946d61a2 100644
index 1e3a56ff656cdfe18cf665eecd8f126275f29715..f7aeb7aca3bf3929d1a8751928318ff6c7da96f6 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 fbb7cf6575a129b22fca2eb8ef950e446946ca50..7edb56a95d214f56556e4e83d843879f
import org.bukkit.DyeColor;
import org.bukkit.Effect;
import org.bukkit.GameMode;
@@ -1955,6 +1956,20 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -1965,6 +1966,20 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* was {@link org.bukkit.event.player.PlayerResourcePackStatusEvent.Status#SUCCESSFULLY_LOADED}
*/
boolean hasResourcePack();

15
patches/api/0094-Add-method-to-open-already-placed-sign.patch → patches/api/0094-Add-openSign-method-to-HumanEntity.patch
View file

@ -1,7 +1,7 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Mark Vainomaa <mikroskeem@mikroskeem.eu>
Date: Sun, 1 Apr 2018 02:28:43 +0300
Subject: [PATCH] Add method to open already placed sign
Subject: [PATCH] Add openSign method to HumanEntity
diff --git a/src/main/java/org/bukkit/entity/HumanEntity.java b/src/main/java/org/bukkit/entity/HumanEntity.java
@ -23,3 +23,16 @@ index 396092fd249928ca01133eeeeb61f0ad90b2e332..5cc025b69c4f405be8f7098d0dcef40f
/**
* Make the entity drop the item in their hand.
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index f7aeb7aca3bf3929d1a8751928318ff6c7da96f6..da5dd22e75b998495258a482557221ebd52e0c39 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -1821,7 +1821,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
/**
* Open a Sign for editing by the Player.
*
- * The Sign must be placed in the same world as the player.
+ * The Sign must be in the same world as the player.
*
* @param sign The sign to edit
*/

4
patches/api/0095-Add-Ban-Methods-to-Player-Objects.patch
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 0dabd6f69e85b21f7ec6e6a2ac46d7fc58af24f6..ac529faeb4e4be2e62228cc931a793f2ff0a28af 100644
index da5dd22e75b998495258a482557221ebd52e0c39..07ae612268a5857cedf8c646a09eb30c9b0a036b 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 0dabd6f69e85b21f7ec6e6a2ac46d7fc58af24f6..ac529faeb4e4be2e62228cc931a793f2
import org.bukkit.DyeColor;
import org.bukkit.Effect;
import org.bukkit.GameMode;
@@ -711,6 +715,162 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -712,6 +716,162 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
public void sendMap(@NotNull MapView map);
// Paper start

4
patches/api/0149-Expose-attack-cooldown-methods-for-Player.patch
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 e6695d006bdf09f63b35e52b6575ba9d7c5bb4c7..0ca16994a5475c685ce06cf14cc965150d239a70 100644
index 07ae612268a5857cedf8c646a09eb30c9b0a036b..b3e63a1a8a71b127735a05bc4938587fc0963c17 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -2130,6 +2130,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -2140,6 +2140,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* @param profile The new profile to use
*/
void setPlayerProfile(@NotNull PlayerProfile profile);

4
patches/api/0196-Add-Player-Client-Options-API.patch
View file

@ -193,7 +193,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 0ca16994a5475c685ce06cf14cc965150d239a70..8e5e7f172818471354f32bcc12289d2e47c03065 100644
index b3e63a1a8a71b127735a05bc4938587fc0963c17..7f42df9683761ef022a2ff47915aca258158d633 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;
@ -204,7 +204,7 @@ index 0ca16994a5475c685ce06cf14cc965150d239a70..8e5e7f172818471354f32bcc12289d2e
import com.destroystokyo.paper.Title; // Paper
import net.kyori.adventure.text.Component;
import com.destroystokyo.paper.profile.PlayerProfile; // Paper
@@ -2150,6 +2151,12 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -2160,6 +2161,12 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* Reset the cooldown counter to 0, effectively starting the cooldown period.
*/
void resetCooldown();

4
patches/api/0220-Brand-support.patch
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 8e5e7f172818471354f32bcc12289d2e47c03065..2656b92a09ea27485436c33915a57df2c072afc7 100644
index 7f42df9683761ef022a2ff47915aca258158d633..59e5f30b46c2c9dcc424e0fd8553e76cd5f721cd 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -2285,6 +2285,16 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -2295,6 +2295,16 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
// Paper end
}

4
patches/api/0229-Player-elytra-boost-API.patch
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 2656b92a09ea27485436c33915a57df2c072afc7..85b1f27ebe66e2ffeec5446b201efe3ec0136ccc 100644
index 59e5f30b46c2c9dcc424e0fd8553e76cd5f721cd..833e049ba0f5f5ac45cc75a6766e8a605eadbf5e 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -2157,6 +2157,19 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -2167,6 +2167,19 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
*/
@NotNull
<T> T getClientOption(@NotNull ClientOption<T> option);

4
patches/api/0257-Add-sendOpLevel-API.patch
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 85b1f27ebe66e2ffeec5446b201efe3ec0136ccc..310c66059c068f523d09bbb3f4218ca40085543c 100644
index 833e049ba0f5f5ac45cc75a6766e8a605eadbf5e..a27abc477900e7007e8e001a778a647af79c2d86 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -2170,6 +2170,17 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -2180,6 +2180,17 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
*/
@Nullable
Firework boostElytra(@NotNull ItemStack firework);

4
patches/api/0308-Add-PlayerKickEvent-causes.patch
View file

@ -5,10 +5,10 @@ Subject: [PATCH] Add PlayerKickEvent causes
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index a6031b6ad451facd8ca6318bd06aa9850feb834c..7de08c12aec311a8de631a8ec37147579c5e9963 100644
index a27abc477900e7007e8e001a778a647af79c2d86..bcd17e01e1be66cc5b7c851a4d1ad62b9f158f9b 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -240,6 +240,14 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -241,6 +241,14 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* @param message kick message
*/
void kick(final @Nullable net.kyori.adventure.text.Component message);

4
patches/api/0344-Add-player-health-update-API.patch
View file

@ -5,10 +5,10 @@ Subject: [PATCH] Add player health update API
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 7907ed07a33557f1011ff8df2a411c6d161e3fda..46357e74bce88c152d4e12e4078fd6ba71deeef7 100644
index bcd17e01e1be66cc5b7c851a4d1ad62b9f158f9b..f5ded992672dde910cd4e1be50c238b142157ff8 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -1583,6 +1583,31 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -1584,6 +1584,31 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
*/
public double getHealthScale();