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

Updated Upstream (Bukkit/CraftBukkit)

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:
214b9f14 SPIGOT-6605: Add method to access value of enforce-whitelist

CraftBukkit Changes:
b121d3b9 SPIGOT-6605: Add method to access value of enforce-whitelist
This commit is contained in:
Shane Freeder 2021-06-29 01:31:35 +01:00
parent 143f38113e
commit 3aae7ef01a
No known key found for this signature in database
GPG key ID: A3F61EA5A085289C
42 changed files with 151 additions and 151 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -426,10 +426,10 @@ index 0000000000000000000000000000000000000000..77db592d05b754f879f8d1790642e9d9
+ }
+}
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index 7c715fdc11ab7837552b1fe3ffd08b31cec0a63b..f3b07f0f1b3be14c8ecd059e1f3594cc90f84442 100644
index 73dafe6093b4c5c385efc8529fab76189085e9d0..f0a28cbb92edf990a3aef076af183cc9796987f3 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -278,7 +278,9 @@ public final class Bukkit {
@@ -302,7 +302,9 @@ public final class Bukkit {
*
* @param message the message
* @return the number of players
@ -439,7 +439,7 @@ index 7c715fdc11ab7837552b1fe3ffd08b31cec0a63b..f3b07f0f1b3be14c8ecd059e1f3594cc
public static int broadcastMessage(@NotNull String message) {
return server.broadcastMessage(message);
}
@@ -836,6 +838,19 @@ public final class Bukkit {
@@ -860,6 +862,19 @@ public final class Bukkit {
server.shutdown();
}
@ -459,7 +459,7 @@ index 7c715fdc11ab7837552b1fe3ffd08b31cec0a63b..f3b07f0f1b3be14c8ecd059e1f3594cc
/**
* Broadcasts the specified message to every user with the given
* permission name.
@@ -845,6 +860,21 @@ public final class Bukkit {
@@ -869,6 +884,21 @@ public final class Bukkit {
* permissibles} must have to receive the broadcast
* @return number of message recipients
*/
@ -481,7 +481,7 @@ index 7c715fdc11ab7837552b1fe3ffd08b31cec0a63b..f3b07f0f1b3be14c8ecd059e1f3594cc
public static int broadcast(@NotNull String message, @NotNull String permission) {
return server.broadcast(message, permission);
}
@@ -1044,6 +1074,7 @@ public final class Bukkit {
@@ -1068,6 +1098,7 @@ public final class Bukkit {
return server.createInventory(owner, type);
}
@ -489,7 +489,7 @@ index 7c715fdc11ab7837552b1fe3ffd08b31cec0a63b..f3b07f0f1b3be14c8ecd059e1f3594cc
/**
* 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;
@@ -1069,6 +1100,38 @@ public final class Bukkit {
@@ -1093,6 +1124,38 @@ public final class Bukkit {
* @see InventoryType#isCreatable()
*/
@NotNull
@ -528,7 +528,7 @@ index 7c715fdc11ab7837552b1fe3ffd08b31cec0a63b..f3b07f0f1b3be14c8ecd059e1f3594cc
public static Inventory createInventory(@Nullable InventoryHolder owner, @NotNull InventoryType type, @NotNull String title) {
return server.createInventory(owner, type, title);
}
@@ -1087,6 +1150,7 @@ public final class Bukkit {
@@ -1111,6 +1174,7 @@ public final class Bukkit {
return server.createInventory(owner, size);
}
@ -536,7 +536,7 @@ index 7c715fdc11ab7837552b1fe3ffd08b31cec0a63b..f3b07f0f1b3be14c8ecd059e1f3594cc
/**
* Creates an empty inventory of type {@link InventoryType#CHEST} with the
* specified size and title.
@@ -1099,10 +1163,30 @@ public final class Bukkit {
@@ -1123,10 +1187,30 @@ public final class Bukkit {
* @throws IllegalArgumentException if the size is not a multiple of 9
*/
@NotNull
@ -567,7 +567,7 @@ index 7c715fdc11ab7837552b1fe3ffd08b31cec0a63b..f3b07f0f1b3be14c8ecd059e1f3594cc
/**
* Creates an empty merchant.
*
@@ -1110,7 +1194,20 @@ public final class Bukkit {
@@ -1134,7 +1218,20 @@ public final class Bukkit {
* when the merchant inventory is viewed
* @return a new merchant
*/
@ -588,7 +588,7 @@ index 7c715fdc11ab7837552b1fe3ffd08b31cec0a63b..f3b07f0f1b3be14c8ecd059e1f3594cc
public static Merchant createMerchant(@Nullable String title) {
return server.createMerchant(title);
}
@@ -1181,22 +1278,47 @@ public final class Bukkit {
@@ -1205,22 +1302,47 @@ public final class Bukkit {
return server.isPrimaryThread();
}
@ -710,7 +710,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 a6b9e4f158583e5932bf8ca210d531857e9f5360..7abdbf43e2f52e8e9e0f7bd7c7a58baf347e3929 100644
index b72a8d2ca0c5b6d78c0a5ca5cc30d8216c34ee88..650b9afc846b1ead0322a4b3ebcdad2d449670da 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -55,13 +55,13 @@ import org.jetbrains.annotations.Nullable;
@ -738,7 +738,7 @@ index a6b9e4f158583e5932bf8ca210d531857e9f5360..7abdbf43e2f52e8e9e0f7bd7c7a58baf
*/
public static final String BROADCAST_CHANNEL_USERS = "bukkit.broadcast.user";
@@ -229,7 +229,9 @@ public interface Server extends PluginMessageRecipient {
@@ -249,7 +249,9 @@ public interface Server extends PluginMessageRecipient {
*
* @param message the message
* @return the number of players
@ -748,7 +748,7 @@ index a6b9e4f158583e5932bf8ca210d531857e9f5360..7abdbf43e2f52e8e9e0f7bd7c7a58baf
public int broadcastMessage(@NotNull String message);
/**
@@ -703,8 +705,33 @@ public interface Server extends PluginMessageRecipient {
@@ -723,8 +725,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
@ -782,7 +782,7 @@ index a6b9e4f158583e5932bf8ca210d531857e9f5360..7abdbf43e2f52e8e9e0f7bd7c7a58baf
/**
* Gets the player by the given name, regardless if they are offline or
@@ -869,6 +896,7 @@ public interface Server extends PluginMessageRecipient {
@@ -889,6 +916,7 @@ public interface Server extends PluginMessageRecipient {
@NotNull
Inventory createInventory(@Nullable InventoryHolder owner, @NotNull InventoryType type);
@ -790,7 +790,7 @@ index a6b9e4f158583e5932bf8ca210d531857e9f5360..7abdbf43e2f52e8e9e0f7bd7c7a58baf
/**
* 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;
@@ -894,6 +922,36 @@ public interface Server extends PluginMessageRecipient {
@@ -914,6 +942,36 @@ public interface Server extends PluginMessageRecipient {
* @see InventoryType#isCreatable()
*/
@NotNull
@ -827,7 +827,7 @@ index a6b9e4f158583e5932bf8ca210d531857e9f5360..7abdbf43e2f52e8e9e0f7bd7c7a58baf
Inventory createInventory(@Nullable InventoryHolder owner, @NotNull InventoryType type, @NotNull String title);
/**
@@ -908,6 +966,22 @@ public interface Server extends PluginMessageRecipient {
@@ -928,6 +986,22 @@ public interface Server extends PluginMessageRecipient {
@NotNull
Inventory createInventory(@Nullable InventoryHolder owner, int size) throws IllegalArgumentException;
@ -850,7 +850,7 @@ index a6b9e4f158583e5932bf8ca210d531857e9f5360..7abdbf43e2f52e8e9e0f7bd7c7a58baf
/**
* Creates an empty inventory of type {@link InventoryType#CHEST} with the
* specified size and title.
@@ -918,10 +992,13 @@ public interface Server extends PluginMessageRecipient {
@@ -938,10 +1012,13 @@ public interface Server extends PluginMessageRecipient {
* viewed
* @return a new inventory
* @throws IllegalArgumentException if the size is not a multiple of 9
@ -864,7 +864,7 @@ index a6b9e4f158583e5932bf8ca210d531857e9f5360..7abdbf43e2f52e8e9e0f7bd7c7a58baf
/**
* Creates an empty merchant.
*
@@ -929,7 +1006,18 @@ public interface Server extends PluginMessageRecipient {
@@ -949,7 +1026,18 @@ public interface Server extends PluginMessageRecipient {
* when the merchant inventory is viewed
* @return a new merchant
*/
@ -883,7 +883,7 @@ index a6b9e4f158583e5932bf8ca210d531857e9f5360..7abdbf43e2f52e8e9e0f7bd7c7a58baf
Merchant createMerchant(@Nullable String title);
/**
@@ -986,20 +1074,41 @@ public interface Server extends PluginMessageRecipient {
@@ -1006,20 +1094,41 @@ public interface Server extends PluginMessageRecipient {
*/
boolean isPrimaryThread();
@ -925,7 +925,7 @@ index a6b9e4f158583e5932bf8ca210d531857e9f5360..7abdbf43e2f52e8e9e0f7bd7c7a58baf
String getShutdownMessage();
/**
@@ -1368,7 +1477,9 @@ public interface Server extends PluginMessageRecipient {
@@ -1388,7 +1497,9 @@ public interface Server extends PluginMessageRecipient {
* Sends the component to the player
*
* @param component the components to send
@ -935,7 +935,7 @@ index a6b9e4f158583e5932bf8ca210d531857e9f5360..7abdbf43e2f52e8e9e0f7bd7c7a58baf
public void broadcast(@NotNull net.md_5.bungee.api.chat.BaseComponent component) {
throw new UnsupportedOperationException("Not supported yet.");
}
@@ -1377,7 +1488,9 @@ public interface Server extends PluginMessageRecipient {
@@ -1397,7 +1508,9 @@ public interface Server extends PluginMessageRecipient {
* Sends an array of components as a single message to the player
*
* @param components the components to send