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

Updated Upstream (Bukkit/CraftBukkit) (#6589)

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:
44cfe143 SPIGOT-6249: Add Missing Effect Constants

CraftBukkit Changes:
14928261 SPIGOT-6249: Add Missing Effect Constants
332335e1 SPIGOT-6731: "Nag author" message in CraftServer lists one author only
6cd975d0 SPIGOT-5732, SPIGOT-6387: Overhaul Hanging entities
This commit is contained in:
Nassim Jahnke 2021-09-11 19:27:48 +02:00 • committed by GitHub
parent d060913a61
commit 06db5d08b0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
111 changed files with 321 additions and 241 deletions
Download patch file Download diff file Expand all files Collapse all files

26
patches/server/0011-Adventure.patch
View file

@ -1713,7 +1713,7 @@ index 7a0e7961df1e62b311ea2ecc76d7343a8646723b..6859fafa42527d45366018f737c19e6c
}
collection = icons;
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 0c430583e4bdc4050e3a278ff500bea3b07c40ee..ca36773a4a01d050a79bfabeb5aba854a86be168 100644
index 9e8b8512a23578b73ec3599a13932fc34e47e16b..6fe94bfe110fe105acb05d4c5f2a328ba9ee476e 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -579,8 +579,10 @@ public final class CraftServer implements Server {
@ -1727,7 +1727,7 @@ index 0c430583e4bdc4050e3a278ff500bea3b07c40ee..ca36773a4a01d050a79bfabeb5aba854
}
@Override
@@ -1406,7 +1408,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);
}
@ -1743,7 +1743,7 @@ index 0c430583e4bdc4050e3a278ff500bea3b07c40ee..ca36773a4a01d050a79bfabeb5aba854
public String getShutdownMessage() {
return this.configuration.getString("settings.shutdown-message");
}
@@ -1559,7 +1569,20 @@ public final class CraftServer implements Server {
@@ -1555,7 +1565,20 @@ public final class CraftServer implements Server {
}
@Override
@ -1764,7 +1764,7 @@ index 0c430583e4bdc4050e3a278ff500bea3b07c40ee..ca36773a4a01d050a79bfabeb5aba854
Set<CommandSender> recipients = new HashSet<>();
for (Permissible permissible : this.getPluginManager().getPermissionSubscriptions(permission)) {
if (permissible instanceof CommandSender && permissible.hasPermission(permission)) {
@@ -1567,14 +1590,14 @@ public final class CraftServer implements Server {
@@ -1563,14 +1586,14 @@ public final class CraftServer implements Server {
}
}
@ -1781,7 +1781,7 @@ index 0c430583e4bdc4050e3a278ff500bea3b07c40ee..ca36773a4a01d050a79bfabeb5aba854
for (CommandSender recipient : recipients) {
recipient.sendMessage(message);
@@ -1810,6 +1833,14 @@ public final class CraftServer implements Server {
@@ -1806,6 +1829,14 @@ public final class CraftServer implements Server {
return CraftInventoryCreator.INSTANCE.createInventory(owner, type);
}
@ -1796,7 +1796,7 @@ index 0c430583e4bdc4050e3a278ff500bea3b07c40ee..ca36773a4a01d050a79bfabeb5aba854
@Override
public Inventory createInventory(InventoryHolder owner, InventoryType type, String title) {
Validate.isTrue(type.isCreatable(), "Cannot open an inventory of type ", type);
@@ -1822,13 +1853,28 @@ public final class CraftServer implements Server {
@@ -1818,13 +1849,28 @@ public final class CraftServer implements Server {
return CraftInventoryCreator.INSTANCE.createInventory(owner, size);
}
@ -1825,7 +1825,7 @@ index 0c430583e4bdc4050e3a278ff500bea3b07c40ee..ca36773a4a01d050a79bfabeb5aba854
public Merchant createMerchant(String title) {
return new CraftMerchantCustom(title == null ? InventoryType.MERCHANT.getDefaultTitle() : title);
}
@@ -1872,6 +1918,12 @@ public final class CraftServer implements Server {
@@ -1868,6 +1914,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)
}
@ -1838,7 +1838,7 @@ index 0c430583e4bdc4050e3a278ff500bea3b07c40ee..ca36773a4a01d050a79bfabeb5aba854
@Override
public String getMotd() {
return this.console.getMotd();
@@ -2300,5 +2352,15 @@ public final class CraftServer implements Server {
@@ -2296,5 +2348,15 @@ public final class CraftServer implements Server {
return null;
}
}
@ -2152,7 +2152,7 @@ index 042691349dd5659e8db526199641cbcfa21c6005..841dbf4a86b19d7c8ea41930ecb1f88c
player.initMenu(container);
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 1a6cca634d6b40a6d5f30eda98be3aa72c2569ad..32f555a846d34e086e75c027a92a48eaf556df94 100644
index cdc13a38400e1e564c1d2388f0fb46e6d66f55d1..2f604c883ee1341ad3896b74de01f4dc9537ecfa 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -244,14 +244,39 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@ -2265,7 +2265,7 @@ index 1a6cca634d6b40a6d5f30eda98be3aa72c2569ad..32f555a846d34e086e75c027a92a48ea
@Override
public void setCompassTarget(Location loc) {
if (this.getHandle().connection == null) return;
@@ -571,6 +607,33 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -572,6 +608,33 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
this.getHandle().connection.send(packet);
}
@ -2299,7 +2299,7 @@ index 1a6cca634d6b40a6d5f30eda98be3aa72c2569ad..32f555a846d34e086e75c027a92a48ea
@Override
public void sendSignChange(Location loc, String[] lines) {
this.sendSignChange(loc, lines, DyeColor.BLACK);
@@ -598,14 +661,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -599,14 +662,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
}
Component[] components = CraftSign.sanitizeLines(lines);
@ -2317,7 +2317,7 @@ index 1a6cca634d6b40a6d5f30eda98be3aa72c2569ad..32f555a846d34e086e75c027a92a48ea
}
@Override
@@ -1705,6 +1769,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1706,6 +1770,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
return (this.getHandle().clientViewDistance == null) ? Bukkit.getViewDistance() : this.getHandle().clientViewDistance;
}
@ -2330,7 +2330,7 @@ index 1a6cca634d6b40a6d5f30eda98be3aa72c2569ad..32f555a846d34e086e75c027a92a48ea
@Override
public int getPing() {
return this.getHandle().latency;
@@ -1733,6 +1803,160 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1734,6 +1804,160 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
getInventory().setItemInMainHand(hand);
}