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

fix compile issue

Browse source
This commit is contained in:
Jake Potrebic 2022-06-09 14:50:05 -07:00
parent 3f1c6a45da
commit e5ed99a29a
No known key found for this signature in database
GPG key ID: ECE0B3C133C016C5
5 changed files with 24 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

16
patches/server/0008-Adventure.patch
View file

@ -1814,7 +1814,7 @@ index 595b56b2ab9a813ba71399d306117294fa90dc65..3527d40102d512d0e276edc969ea3c18
}
collection = icons;
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 036aa7daa097c2ba0f08a1fcc66c2962883ca72f..f9ddb9835cad1b76eecd639dff8fa29472954421 100644
index d239bc3f3cd1490acbac9d50239cc0a3d824148e..33e1a2c12a82f04d2a1da02b915402bbee76e1dd 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -581,8 +581,10 @@ public final class CraftServer implements Server {
@ -1828,7 +1828,7 @@ index 036aa7daa097c2ba0f08a1fcc66c2962883ca72f..f9ddb9835cad1b76eecd639dff8fa294
}
@Override
@@ -1403,7 +1405,15 @@ public final class CraftServer implements Server {
@@ -1402,7 +1404,15 @@ public final class CraftServer implements Server {
return this.configuration.getInt("settings.spawn-radius", -1);
}
@ -1844,7 +1844,7 @@ index 036aa7daa097c2ba0f08a1fcc66c2962883ca72f..f9ddb9835cad1b76eecd639dff8fa294
public String getShutdownMessage() {
return this.configuration.getString("settings.shutdown-message");
}
@@ -1561,7 +1571,20 @@ public final class CraftServer implements Server {
@@ -1560,7 +1570,20 @@ public final class CraftServer implements Server {
}
@Override
@ -1865,7 +1865,7 @@ index 036aa7daa097c2ba0f08a1fcc66c2962883ca72f..f9ddb9835cad1b76eecd639dff8fa294
Set<CommandSender> recipients = new HashSet<>();
for (Permissible permissible : this.getPluginManager().getPermissionSubscriptions(permission)) {
if (permissible instanceof CommandSender && permissible.hasPermission(permission)) {
@@ -1569,14 +1592,14 @@ public final class CraftServer implements Server {
@@ -1568,14 +1591,14 @@ public final class CraftServer implements Server {
}
}
@ -1882,7 +1882,7 @@ index 036aa7daa097c2ba0f08a1fcc66c2962883ca72f..f9ddb9835cad1b76eecd639dff8fa294
for (CommandSender recipient : recipients) {
recipient.sendMessage(message);
@@ -1827,6 +1850,14 @@ public final class CraftServer implements Server {
@@ -1826,6 +1849,14 @@ public final class CraftServer implements Server {
return CraftInventoryCreator.INSTANCE.createInventory(owner, type);
}
@ -1897,7 +1897,7 @@ index 036aa7daa097c2ba0f08a1fcc66c2962883ca72f..f9ddb9835cad1b76eecd639dff8fa294
@Override
public Inventory createInventory(InventoryHolder owner, InventoryType type, String title) {
Validate.isTrue(type.isCreatable(), "Cannot open an inventory of type ", type);
@@ -1839,13 +1870,28 @@ public final class CraftServer implements Server {
@@ -1838,13 +1869,28 @@ public final class CraftServer implements Server {
return CraftInventoryCreator.INSTANCE.createInventory(owner, size);
}
@ -1926,7 +1926,7 @@ index 036aa7daa097c2ba0f08a1fcc66c2962883ca72f..f9ddb9835cad1b76eecd639dff8fa294
public Merchant createMerchant(String title) {
return new CraftMerchantCustom(title == null ? InventoryType.MERCHANT.getDefaultTitle() : title);
}
@@ -1905,6 +1951,12 @@ public final class CraftServer implements Server {
@@ -1904,6 +1950,12 @@ public final class CraftServer implements Server {
return Thread.currentThread().equals(console.serverThread) || this.console.hasStopped() || !org.spigotmc.AsyncCatcher.enabled; // All bets are off if we have shut down (e.g. due to watchdog)
}
@ -1939,7 +1939,7 @@ index 036aa7daa097c2ba0f08a1fcc66c2962883ca72f..f9ddb9835cad1b76eecd639dff8fa294
@Override
public String getMotd() {
return this.console.getMotd();
@@ -2322,4 +2374,15 @@ public final class CraftServer implements Server {
@@ -2321,4 +2373,15 @@ public final class CraftServer implements Server {
return this.spigot;
}
// Spigot end