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

Move patches over, start with first few

Browse source
This commit is contained in:
Nassim Jahnke 2022-07-27 20:52:03 +02:00
parent 86f87ba400
commit 734a43657a
No known key found for this signature in database
GPG key ID: 6BE3B555EBC5982B
957 changed files with 286 additions and 285 deletions
Download patch file Download diff file Expand all files Collapse all files

54
patches/api/0005-Adventure.patch
View file

@ -1644,7 +1644,7 @@ index 922d33ff4fa9d901d3c5c0a9f8399ad8aef62c37..cd287978c34873c7122794e4f3e76291
+ // Paper end
}
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 6cac14eabdbdf7fd8c322d5fb4dfbfbb266ae940..c580ec19cd2b55a4aeca49d9cd984ce7c2848cef 100644
index c652660f8e053b066d0d40a89ab6f1b86655f71b..2c5fc4f62b2c16de1f4f94f52aae5baf8af6d694 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -37,7 +37,28 @@ import org.jetbrains.annotations.Nullable;
@ -1676,8 +1676,8 @@ index 6cac14eabdbdf7fd8c322d5fb4dfbfbb266ae940..c580ec19cd2b55a4aeca49d9cd984ce7
+ // Paper end
/**
* Gets the "friendly" name to display of this player. This may include
@@ -47,7 +68,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* {@inheritDoc}
@@ -54,7 +75,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* places defined by plugins.
*
* @return the friendly name
@ -1687,7 +1687,7 @@ index 6cac14eabdbdf7fd8c322d5fb4dfbfbb266ae940..c580ec19cd2b55a4aeca49d9cd984ce7
@NotNull
public String getDisplayName();
@@ -59,15 +82,50 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -66,15 +89,50 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* places defined by plugins.
*
* @param name The new display name.
@ -1738,7 +1738,7 @@ index 6cac14eabdbdf7fd8c322d5fb4dfbfbb266ae940..c580ec19cd2b55a4aeca49d9cd984ce7
public String getPlayerListName();
/**
@@ -76,14 +134,18 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -83,14 +141,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
@ -1757,7 +1757,7 @@ index 6cac14eabdbdf7fd8c322d5fb4dfbfbb266ae940..c580ec19cd2b55a4aeca49d9cd984ce7
@Nullable
public String getPlayerListHeader();
@@ -91,7 +153,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -98,7 +160,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
@ -1767,7 +1767,7 @@ index 6cac14eabdbdf7fd8c322d5fb4dfbfbb266ae940..c580ec19cd2b55a4aeca49d9cd984ce7
@Nullable
public String getPlayerListFooter();
@@ -99,14 +163,18 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -106,14 +170,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
@ -1786,7 +1786,7 @@ index 6cac14eabdbdf7fd8c322d5fb4dfbfbb266ae940..c580ec19cd2b55a4aeca49d9cd984ce7
public void setPlayerListFooter(@Nullable String footer);
/**
@@ -115,7 +183,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -122,7 +190,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
@ -1796,7 +1796,7 @@ index 6cac14eabdbdf7fd8c322d5fb4dfbfbb266ae940..c580ec19cd2b55a4aeca49d9cd984ce7
public void setPlayerListHeaderFooter(@Nullable String header, @Nullable String footer);
/**
@@ -153,9 +223,25 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -160,9 +230,25 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* Kicks player with custom kick message.
*
* @param message kick message
@ -1822,7 +1822,7 @@ index 6cac14eabdbdf7fd8c322d5fb4dfbfbb266ae940..c580ec19cd2b55a4aeca49d9cd984ce7
/**
* Says a message (or runs a command).
*
@@ -507,6 +593,90 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -514,6 +600,90 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
*/
public void sendEquipmentChange(@NotNull LivingEntity entity, @NotNull EquipmentSlot slot, @NotNull ItemStack item);
@ -1913,7 +1913,7 @@ index 6cac14eabdbdf7fd8c322d5fb4dfbfbb266ae940..c580ec19cd2b55a4aeca49d9cd984ce7
/**
* 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.
@@ -521,7 +691,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -528,7 +698,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* @param lines the new text on the sign or null to clear it
* @throws IllegalArgumentException if location is null
* @throws IllegalArgumentException if lines is non-null and has a length less than 4
@ -1923,7 +1923,7 @@ index 6cac14eabdbdf7fd8c322d5fb4dfbfbb266ae940..c580ec19cd2b55a4aeca49d9cd984ce7
public void sendSignChange(@NotNull Location loc, @Nullable String[] lines) throws IllegalArgumentException;
/**
@@ -540,7 +712,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -547,7 +719,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
@ -1933,7 +1933,7 @@ index 6cac14eabdbdf7fd8c322d5fb4dfbfbb266ae940..c580ec19cd2b55a4aeca49d9cd984ce7
public void sendSignChange(@NotNull Location loc, @Nullable String[] lines, @NotNull DyeColor dyeColor) throws IllegalArgumentException;
/**
@@ -560,7 +734,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -567,7 +741,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
@ -1943,7 +1943,7 @@ index 6cac14eabdbdf7fd8c322d5fb4dfbfbb266ae940..c580ec19cd2b55a4aeca49d9cd984ce7
public void sendSignChange(@NotNull Location loc, @Nullable String[] lines, @NotNull DyeColor dyeColor, boolean hasGlowingText) throws IllegalArgumentException;
/**
@@ -1035,6 +1211,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -1042,6 +1218,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* pack correctly.
* </ul>
*
@ -1951,7 +1951,7 @@ index 6cac14eabdbdf7fd8c322d5fb4dfbfbb266ae940..c580ec19cd2b55a4aeca49d9cd984ce7
* @param url The URL from which the client will download the resource
* pack. The string must contain only US-ASCII characters and should
* be encoded as per RFC 1738.
@@ -1048,8 +1225,57 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -1055,8 +1232,57 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* @throws IllegalArgumentException Thrown if the hash is not 20 bytes
* long.
*/
@ -2009,7 +2009,7 @@ index 6cac14eabdbdf7fd8c322d5fb4dfbfbb266ae940..c580ec19cd2b55a4aeca49d9cd984ce7
/**
* Request that the player's client download and switch resource packs.
* <p>
@@ -1124,6 +1350,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -1131,6 +1357,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* pack correctly.
* </ul>
*
@ -2017,7 +2017,7 @@ index 6cac14eabdbdf7fd8c322d5fb4dfbfbb266ae940..c580ec19cd2b55a4aeca49d9cd984ce7
* @param url The URL from which the client will download the resource
* pack. The string must contain only US-ASCII characters and should
* be encoded as per RFC 1738.
@@ -1139,8 +1366,57 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -1146,8 +1373,57 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* @throws IllegalArgumentException Thrown if the hash is not 20 bytes
* long.
*/
@ -2075,7 +2075,7 @@ index 6cac14eabdbdf7fd8c322d5fb4dfbfbb266ae940..c580ec19cd2b55a4aeca49d9cd984ce7
/**
* Gets the Scoreboard displayed to this player
*
@@ -1256,7 +1532,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -1263,7 +1539,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
*
* @param title Title text
* @param subtitle Subtitle text
@ -2084,7 +2084,7 @@ index 6cac14eabdbdf7fd8c322d5fb4dfbfbb266ae940..c580ec19cd2b55a4aeca49d9cd984ce7
*/
@Deprecated
public void sendTitle(@Nullable String title, @Nullable String subtitle);
@@ -1275,7 +1551,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -1282,7 +1558,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.
@ -2094,7 +2094,7 @@ index 6cac14eabdbdf7fd8c322d5fb4dfbfbb266ae940..c580ec19cd2b55a4aeca49d9cd984ce7
public void sendTitle(@Nullable String title, @Nullable String subtitle, int fadeIn, int stay, int fadeOut);
/**
@@ -1502,6 +1780,14 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -1509,6 +1787,14 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
*/
public int getClientViewDistance();
@ -2109,7 +2109,7 @@ index 6cac14eabdbdf7fd8c322d5fb4dfbfbb266ae940..c580ec19cd2b55a4aeca49d9cd984ce7
/**
* Gets the player's estimated ping in milliseconds.
*
@@ -1527,8 +1813,10 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -1534,8 +1820,10 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* they wish.
*
* @return the player's locale
@ -2120,7 +2120,7 @@ index 6cac14eabdbdf7fd8c322d5fb4dfbfbb266ae940..c580ec19cd2b55a4aeca49d9cd984ce7
public String getLocale();
/**
@@ -1570,6 +1858,14 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -1577,6 +1865,14 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
*/
public boolean isAllowingServerListings();
@ -2135,7 +2135,7 @@ index 6cac14eabdbdf7fd8c322d5fb4dfbfbb266ae940..c580ec19cd2b55a4aeca49d9cd984ce7
// Spigot start
public class Spigot extends Entity.Spigot {
@@ -1624,11 +1920,13 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -1631,11 +1927,13 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
throw new UnsupportedOperationException("Not supported yet.");
}
@ -2149,7 +2149,7 @@ index 6cac14eabdbdf7fd8c322d5fb4dfbfbb266ae940..c580ec19cd2b55a4aeca49d9cd984ce7
@Override
public void sendMessage(@NotNull net.md_5.bungee.api.chat.BaseComponent... components) {
throw new UnsupportedOperationException("Not supported yet.");
@@ -1639,7 +1937,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -1646,7 +1944,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
*
* @param position the screen position
* @param component the components to send
@ -2159,7 +2159,7 @@ index 6cac14eabdbdf7fd8c322d5fb4dfbfbb266ae940..c580ec19cd2b55a4aeca49d9cd984ce7
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.");
}
@@ -1649,7 +1949,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -1656,7 +1956,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
*
* @param position the screen position
* @param components the components to send
@ -2169,7 +2169,7 @@ index 6cac14eabdbdf7fd8c322d5fb4dfbfbb266ae940..c580ec19cd2b55a4aeca49d9cd984ce7
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.");
}
@@ -1660,7 +1962,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -1667,7 +1969,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
@ -2179,7 +2179,7 @@ index 6cac14eabdbdf7fd8c322d5fb4dfbfbb266ae940..c580ec19cd2b55a4aeca49d9cd984ce7
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.");
}
@@ -1671,7 +1975,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -1678,7 +1982,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