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

Updated Upstream (Bukkit/CraftBukkit/Spigot)

Browse source 
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:
64c8bd39 #679: Add getHideOnlinePlayers
b991b6c7 #677: Add "Allow Server Listings" API
4e9f199a SPIGOT-6801: Wrong BlockData classes in Material enum for SOUL_FIRE and SOUL_TORCH

CraftBukkit Changes:
37e63e63 Fix loading / creating secondary worlds (nether/end)
4bf7f33c #956: Add getHideOnlinePlayers
d181e1ed Fix serializing unhandled NBT + add unit test with unhandled NBT
aebb79e3 #954: Add "Allow Server Listings" API
7c4707e4 #955: Add test for BlockData class of Material

Spigot Changes:
16c0cb41 Rebuild patches
This commit is contained in:
MiniDigger 2021-11-23 06:49:33 +01:00 • committed by MiniDigger | Martin
parent c93f56ac1c
commit 79b873c901
36 changed files with 137 additions and 137 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -472,7 +472,7 @@ index 0000000000000000000000000000000000000000..77db592d05b754f879f8d1790642e9d9
+ }
+}
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index e0ee875391d0296a00c53bbec2935fa1fc1af731..f2642d518218da9c3fae8a4445cfed8244471d07 100644
index a238302f2a12194aa30a88867070705dc749b36b..b8e63b2c2870dd2eb9d31f51590b9b958de6a17f 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -312,7 +312,9 @@ public final class Bukkit {
@ -485,7 +485,7 @@ index e0ee875391d0296a00c53bbec2935fa1fc1af731..f2642d518218da9c3fae8a4445cfed82
public static int broadcastMessage(@NotNull String message) {
return server.broadcastMessage(message);
}
@@ -946,6 +948,19 @@ public final class Bukkit {
@@ -955,6 +957,19 @@ public final class Bukkit {
server.shutdown();
}
@ -505,7 +505,7 @@ index e0ee875391d0296a00c53bbec2935fa1fc1af731..f2642d518218da9c3fae8a4445cfed82
/**
* Broadcasts the specified message to every user with the given
* permission name.
@@ -955,6 +970,21 @@ public final class Bukkit {
@@ -964,6 +979,21 @@ public final class Bukkit {
* permissibles} must have to receive the broadcast
* @return number of message recipients
*/
@ -527,7 +527,7 @@ index e0ee875391d0296a00c53bbec2935fa1fc1af731..f2642d518218da9c3fae8a4445cfed82
public static int broadcast(@NotNull String message, @NotNull String permission) {
return server.broadcast(message, permission);
}
@@ -1154,6 +1184,7 @@ public final class Bukkit {
@@ -1163,6 +1193,7 @@ public final class Bukkit {
return server.createInventory(owner, type);
}
@ -535,7 +535,7 @@ index e0ee875391d0296a00c53bbec2935fa1fc1af731..f2642d518218da9c3fae8a4445cfed82
/**
* Creates an empty inventory with the specified type and title. If the type
* is {@link InventoryType#CHEST}, the new inventory has a size of 27;
@@ -1179,6 +1210,38 @@ public final class Bukkit {
@@ -1188,6 +1219,38 @@ public final class Bukkit {
* @see InventoryType#isCreatable()
*/
@NotNull
@ -574,7 +574,7 @@ index e0ee875391d0296a00c53bbec2935fa1fc1af731..f2642d518218da9c3fae8a4445cfed82
public static Inventory createInventory(@Nullable InventoryHolder owner, @NotNull InventoryType type, @NotNull String title) {
return server.createInventory(owner, type, title);
}
@@ -1197,6 +1260,7 @@ public final class Bukkit {
@@ -1206,6 +1269,7 @@ public final class Bukkit {
return server.createInventory(owner, size);
}
@ -582,7 +582,7 @@ index e0ee875391d0296a00c53bbec2935fa1fc1af731..f2642d518218da9c3fae8a4445cfed82
/**
* Creates an empty inventory of type {@link InventoryType#CHEST} with the
* specified size and title.
@@ -1209,10 +1273,30 @@ public final class Bukkit {
@@ -1218,10 +1282,30 @@ public final class Bukkit {
* @throws IllegalArgumentException if the size is not a multiple of 9
*/
@NotNull
@ -613,7 +613,7 @@ index e0ee875391d0296a00c53bbec2935fa1fc1af731..f2642d518218da9c3fae8a4445cfed82
/**
* Creates an empty merchant.
*
@@ -1220,7 +1304,20 @@ public final class Bukkit {
@@ -1229,7 +1313,20 @@ public final class Bukkit {
* when the merchant inventory is viewed
* @return a new merchant
*/
@ -634,7 +634,7 @@ index e0ee875391d0296a00c53bbec2935fa1fc1af731..f2642d518218da9c3fae8a4445cfed82
public static Merchant createMerchant(@Nullable String title) {
return server.createMerchant(title);
}
@@ -1300,22 +1397,47 @@ public final class Bukkit {
@@ -1309,22 +1406,47 @@ public final class Bukkit {
return server.isPrimaryThread();
}
@ -756,7 +756,7 @@ index 803fa0019869127ee8c7e4fb1777a59c43e66f8a..c65f0d6569c130b4920a9e71ad24af64
+ // Paper end
}
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index bfd003c5acf1b06378c7ee107c73471ad18e6675..922ad1a22460c32965291a213175fcb69c34b087 100644
index 3e91c4000c468fd8bdcb938e942a7bbf4988cab2..f048278df8abb313a319136e8b697d9c87fb5d0a 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -56,13 +56,13 @@ import org.jetbrains.annotations.Nullable;
@ -794,7 +794,7 @@ index bfd003c5acf1b06378c7ee107c73471ad18e6675..922ad1a22460c32965291a213175fcb6
public int broadcastMessage(@NotNull String message);
/**
@@ -802,8 +804,33 @@ public interface Server extends PluginMessageRecipient {
@@ -809,8 +811,33 @@ public interface Server extends PluginMessageRecipient {
* @param permission the required permission {@link Permissible
* permissibles} must have to receive the broadcast
* @return number of message recipients
@ -828,7 +828,7 @@ index bfd003c5acf1b06378c7ee107c73471ad18e6675..922ad1a22460c32965291a213175fcb6
/**
* Gets the player by the given name, regardless if they are offline or
@@ -968,6 +995,7 @@ public interface Server extends PluginMessageRecipient {
@@ -975,6 +1002,7 @@ public interface Server extends PluginMessageRecipient {
@NotNull
Inventory createInventory(@Nullable InventoryHolder owner, @NotNull InventoryType type);
@ -836,7 +836,7 @@ index bfd003c5acf1b06378c7ee107c73471ad18e6675..922ad1a22460c32965291a213175fcb6
/**
* Creates an empty inventory with the specified type and title. If the type
* is {@link InventoryType#CHEST}, the new inventory has a size of 27;
@@ -993,6 +1021,36 @@ public interface Server extends PluginMessageRecipient {
@@ -1000,6 +1028,36 @@ public interface Server extends PluginMessageRecipient {
* @see InventoryType#isCreatable()
*/
@NotNull
@ -873,7 +873,7 @@ index bfd003c5acf1b06378c7ee107c73471ad18e6675..922ad1a22460c32965291a213175fcb6
Inventory createInventory(@Nullable InventoryHolder owner, @NotNull InventoryType type, @NotNull String title);
/**
@@ -1007,6 +1065,22 @@ public interface Server extends PluginMessageRecipient {
@@ -1014,6 +1072,22 @@ public interface Server extends PluginMessageRecipient {
@NotNull
Inventory createInventory(@Nullable InventoryHolder owner, int size) throws IllegalArgumentException;
@ -896,7 +896,7 @@ index bfd003c5acf1b06378c7ee107c73471ad18e6675..922ad1a22460c32965291a213175fcb6
/**
* Creates an empty inventory of type {@link InventoryType#CHEST} with the
* specified size and title.
@@ -1017,10 +1091,13 @@ public interface Server extends PluginMessageRecipient {
@@ -1024,10 +1098,13 @@ public interface Server extends PluginMessageRecipient {
* viewed
* @return a new inventory
* @throws IllegalArgumentException if the size is not a multiple of 9
@ -910,7 +910,7 @@ index bfd003c5acf1b06378c7ee107c73471ad18e6675..922ad1a22460c32965291a213175fcb6
/**
* Creates an empty merchant.
*
@@ -1028,7 +1105,18 @@ public interface Server extends PluginMessageRecipient {
@@ -1035,7 +1112,18 @@ public interface Server extends PluginMessageRecipient {
* when the merchant inventory is viewed
* @return a new merchant
*/
@ -929,7 +929,7 @@ index bfd003c5acf1b06378c7ee107c73471ad18e6675..922ad1a22460c32965291a213175fcb6
Merchant createMerchant(@Nullable String title);
/**
@@ -1092,20 +1180,41 @@ public interface Server extends PluginMessageRecipient {
@@ -1099,20 +1187,41 @@ public interface Server extends PluginMessageRecipient {
*/
boolean isPrimaryThread();
@ -971,7 +971,7 @@ index bfd003c5acf1b06378c7ee107c73471ad18e6675..922ad1a22460c32965291a213175fcb6
String getShutdownMessage();
/**
@@ -1482,7 +1591,9 @@ public interface Server extends PluginMessageRecipient {
@@ -1489,7 +1598,9 @@ public interface Server extends PluginMessageRecipient {
* Sends the component to the player
*
* @param component the components to send
@ -981,7 +981,7 @@ index bfd003c5acf1b06378c7ee107c73471ad18e6675..922ad1a22460c32965291a213175fcb6
public void broadcast(@NotNull net.md_5.bungee.api.chat.BaseComponent component) {
throw new UnsupportedOperationException("Not supported yet.");
}
@@ -1491,7 +1602,9 @@ public interface Server extends PluginMessageRecipient {
@@ -1498,7 +1609,9 @@ public interface Server extends PluginMessageRecipient {
* Sends an array of components as a single message to the player
*
* @param components the components to send
@ -1547,7 +1547,7 @@ 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 8b6cd8f61e1ca03797a26e7549b492a3279dbaa4..d88613f54f368a27130675c4ea7569646dbe74d7 100644
index ad1a3148b05f4fef26c9d587da94e01cdbfa3c3c..1140c29cffaac3c25f7d2591e5d635d070206041 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;
@ -1888,9 +1888,9 @@ index 8b6cd8f61e1ca03797a26e7549b492a3279dbaa4..d88613f54f368a27130675c4ea756964
public String getLocale();
/**
@@ -1307,6 +1490,14 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -1314,6 +1497,14 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
*/
public void openBook(@NotNull ItemStack book);
public boolean isAllowingServerListings();
+ // Paper start
+ @NotNull
@ -1903,7 +1903,7 @@ index 8b6cd8f61e1ca03797a26e7549b492a3279dbaa4..d88613f54f368a27130675c4ea756964
// Spigot start
public class Spigot extends Entity.Spigot {
@@ -1361,11 +1552,13 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -1368,11 +1559,13 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
throw new UnsupportedOperationException("Not supported yet.");
}
@ -1917,7 +1917,7 @@ index 8b6cd8f61e1ca03797a26e7549b492a3279dbaa4..d88613f54f368a27130675c4ea756964
@Override
public void sendMessage(@NotNull net.md_5.bungee.api.chat.BaseComponent... components) {
throw new UnsupportedOperationException("Not supported yet.");
@@ -1376,7 +1569,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -1383,7 +1576,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
*
* @param position the screen position
* @param component the components to send
@ -1927,7 +1927,7 @@ index 8b6cd8f61e1ca03797a26e7549b492a3279dbaa4..d88613f54f368a27130675c4ea756964
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.");
}
@@ -1386,7 +1581,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -1393,7 +1588,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
*
* @param position the screen position
* @param components the components to send
@ -1937,7 +1937,7 @@ index 8b6cd8f61e1ca03797a26e7549b492a3279dbaa4..d88613f54f368a27130675c4ea756964
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.");
}
@@ -1397,7 +1594,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -1404,7 +1601,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
@ -1947,7 +1947,7 @@ index 8b6cd8f61e1ca03797a26e7549b492a3279dbaa4..d88613f54f368a27130675c4ea756964
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.");
}
@@ -1408,7 +1607,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -1415,7 +1614,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