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:
fc460d1b PR-735: Add Villager#zombify
c8c8331e PR-690: Add method to read ItemStack input
62845f2f SPIGOT-6829: Add per-player world border API

CraftBukkit Changes:
a459f4d4 PR-1033: Add Villager#zombify
d65d1430 PR-975: Add method to read ItemStack input
b5559f8c SPIGOT-6990: Fix setRepairCost(0) in Anvil
6c308e1b SPIGOT-6829: Add per-player world border API

Spigot Changes:
42b61526 SPIGOT-7000: Generation and /locate issues when using custom structure seeds
This commit is contained in:
Nassim Jahnke 2022-04-16 10:29:50 +02:00
parent c6e631aacb
commit 1cfd363d32
No known key found for this signature in database
GPG key ID: 6BE3B555EBC5982B
263 changed files with 600 additions and 637 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1163,7 +1163,7 @@ index 762a9392ffac3042356709dddd15bb3516048bed..3544e2dc2522e9d6305d727d56e73490
buf.writeComponent(this.footer);
}
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index 2eebeb696e853c2ba17a9a65ca8d0fd7dff9baa9..25bc0d6a09def9820106bd5889fdcca4aeeba19f 100644
index 3700c14c8fe5a52ad6eb6d1ca58232beea16c2d7..a29450df13bc32d5bc700a944541793a696a94d2 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -145,6 +145,7 @@ import net.minecraft.world.scores.Score;
@ -1174,7 +1174,7 @@ index 2eebeb696e853c2ba17a9a65ca8d0fd7dff9baa9..25bc0d6a09def9820106bd5889fdcca4
import org.bukkit.Bukkit;
import org.bukkit.Location;
import org.bukkit.WeatherType;
@@ -220,6 +221,7 @@ public class ServerPlayer extends Player {
@@ -221,6 +222,7 @@ public class ServerPlayer extends Player {
// CraftBukkit start
public String displayName;
@ -1182,7 +1182,7 @@ index 2eebeb696e853c2ba17a9a65ca8d0fd7dff9baa9..25bc0d6a09def9820106bd5889fdcca4
public Component listName;
public org.bukkit.Location compassTarget;
public int newExp = 0;
@@ -302,6 +304,7 @@ public class ServerPlayer extends Player {
@@ -303,6 +305,7 @@ public class ServerPlayer extends Player {
// CraftBukkit start
this.displayName = this.getScoreboardName();
@ -1190,7 +1190,7 @@ index 2eebeb696e853c2ba17a9a65ca8d0fd7dff9baa9..25bc0d6a09def9820106bd5889fdcca4
this.bukkitPickUpLoot = true;
this.maxHealthCache = this.getMaxHealth();
}
@@ -773,22 +776,17 @@ public class ServerPlayer extends Player {
@@ -778,22 +781,17 @@ public class ServerPlayer extends Player {
String deathmessage = defaultMessage.getString();
this.keepLevel = keepInventory; // SPIGOT-2222: pre-set keepLevel
@ -1217,7 +1217,7 @@ index 2eebeb696e853c2ba17a9a65ca8d0fd7dff9baa9..25bc0d6a09def9820106bd5889fdcca4
this.connection.send(new ClientboundPlayerCombatKillPacket(this.getCombatTracker(), ichatbasecomponent), (future) -> {
if (!future.isSuccess()) {
@@ -1730,6 +1728,7 @@ public class ServerPlayer extends Player {
@@ -1735,6 +1733,7 @@ public class ServerPlayer extends Player {
}
public String locale = "en_us"; // CraftBukkit - add, lowercase
@ -1225,7 +1225,7 @@ index 2eebeb696e853c2ba17a9a65ca8d0fd7dff9baa9..25bc0d6a09def9820106bd5889fdcca4
public void updateOptions(ServerboundClientInformationPacket packet) {
// CraftBukkit start
if (getMainArm() != packet.mainHand()) {
@@ -1741,6 +1740,10 @@ public class ServerPlayer extends Player {
@@ -1746,6 +1745,10 @@ public class ServerPlayer extends Player {
this.server.server.getPluginManager().callEvent(event);
}
this.locale = packet.language;
@ -1635,10 +1635,10 @@ 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 e71bc0315f9e4559e2df6a83a3c11f1024d17de9..586bfdc39840170b6bb43ef99a1e1f72ec84b062 100644
index d29c6d0536619fab5a48fbb52115dac09e7d7ca3..75871f74a25ee34db89a431de584b9982ed07496 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -585,8 +585,10 @@ public final class CraftServer implements Server {
@@ -586,8 +586,10 @@ public final class CraftServer implements Server {
}
@Override
@ -1649,7 +1649,7 @@ index e71bc0315f9e4559e2df6a83a3c11f1024d17de9..586bfdc39840170b6bb43ef99a1e1f72
}
@Override
@@ -1415,7 +1417,15 @@ public final class CraftServer implements Server {
@@ -1421,7 +1423,15 @@ public final class CraftServer implements Server {
return this.configuration.getInt("settings.spawn-radius", -1);
}
@ -1665,7 +1665,7 @@ index e71bc0315f9e4559e2df6a83a3c11f1024d17de9..586bfdc39840170b6bb43ef99a1e1f72
public String getShutdownMessage() {
return this.configuration.getString("settings.shutdown-message");
}
@@ -1573,7 +1583,20 @@ public final class CraftServer implements Server {
@@ -1579,7 +1589,20 @@ public final class CraftServer implements Server {
}
@Override
@ -1686,7 +1686,7 @@ index e71bc0315f9e4559e2df6a83a3c11f1024d17de9..586bfdc39840170b6bb43ef99a1e1f72
Set<CommandSender> recipients = new HashSet<>();
for (Permissible permissible : this.getPluginManager().getPermissionSubscriptions(permission)) {
if (permissible instanceof CommandSender && permissible.hasPermission(permission)) {
@@ -1581,14 +1604,14 @@ public final class CraftServer implements Server {
@@ -1587,14 +1610,14 @@ public final class CraftServer implements Server {
}
}
@ -1703,7 +1703,7 @@ index e71bc0315f9e4559e2df6a83a3c11f1024d17de9..586bfdc39840170b6bb43ef99a1e1f72
for (CommandSender recipient : recipients) {
recipient.sendMessage(message);
@@ -1839,6 +1862,14 @@ public final class CraftServer implements Server {
@@ -1845,6 +1868,14 @@ public final class CraftServer implements Server {
return CraftInventoryCreator.INSTANCE.createInventory(owner, type);
}
@ -1718,7 +1718,7 @@ index e71bc0315f9e4559e2df6a83a3c11f1024d17de9..586bfdc39840170b6bb43ef99a1e1f72
@Override
public Inventory createInventory(InventoryHolder owner, InventoryType type, String title) {
Validate.isTrue(type.isCreatable(), "Cannot open an inventory of type ", type);
@@ -1851,13 +1882,28 @@ public final class CraftServer implements Server {
@@ -1857,13 +1888,28 @@ public final class CraftServer implements Server {
return CraftInventoryCreator.INSTANCE.createInventory(owner, size);
}
@ -1747,7 +1747,7 @@ index e71bc0315f9e4559e2df6a83a3c11f1024d17de9..586bfdc39840170b6bb43ef99a1e1f72
public Merchant createMerchant(String title) {
return new CraftMerchantCustom(title == null ? InventoryType.MERCHANT.getDefaultTitle() : title);
}
@@ -1917,6 +1963,12 @@ public final class CraftServer implements Server {
@@ -1923,6 +1969,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)
}
@ -1760,7 +1760,7 @@ index e71bc0315f9e4559e2df6a83a3c11f1024d17de9..586bfdc39840170b6bb43ef99a1e1f72
@Override
public String getMotd() {
return this.console.getMotd();
@@ -2358,5 +2410,15 @@ public final class CraftServer implements Server {
@@ -2364,5 +2416,15 @@ public final class CraftServer implements Server {
return null;
}
}
@ -1777,7 +1777,7 @@ index e71bc0315f9e4559e2df6a83a3c11f1024d17de9..586bfdc39840170b6bb43ef99a1e1f72
// Paper end
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 794ed40db102370338ee227ffa4e1801fd741284..5963fa56e7dcd61336a14fa1035c6c14143989ad 100644
index 0bc0bd2e6861772f32e24694ad733fa4813f3033..305d5cb3581764b4d89c1f2220acb5786eb8faef 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -142,6 +142,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@ -1808,7 +1808,7 @@ index 794ed40db102370338ee227ffa4e1801fd741284..5963fa56e7dcd61336a14fa1035c6c14
+ // Paper end
}
diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
index 7861f86a47597883a3813d32f462c514a76eb8ef..339ee79ec1da8a9c865fd5444dc00c206983fcd8 100644
index fae37b7b353cb7b0f8d4a79407fcc219a3c45b64..aff3116c77277dcb4d3825d33f40a0b17258a0ba 100644
--- a/src/main/java/org/bukkit/craftbukkit/Main.java
+++ b/src/main/java/org/bukkit/craftbukkit/Main.java
@@ -19,6 +19,12 @@ public class Main {
@ -2285,10 +2285,10 @@ index 446fdca49a5a6999626a7ee3a1d5c168b15a09dd..f9863e138994f6c7a7975a852f106faa
public boolean isOp() {
return true;
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 76160b76d7d469fb75e733c24d3f1ddf4796485e..65c54d3f52cf5977cf2274d8d5867570082bd8c4 100644
index 2577a135bb88adc9000ab67477846c6466d973e7..09f43730e40b4ab9f0a6c8d175cbcf7c9e069fac 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -262,14 +262,39 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -272,14 +272,39 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@Override
public String getDisplayName() {
@ -2328,7 +2328,7 @@ index 76160b76d7d469fb75e733c24d3f1ddf4796485e..65c54d3f52cf5977cf2274d8d5867570
@Override
public String getPlayerListName() {
return this.getHandle().listName == null ? getName() : CraftChatMessage.fromComponent(this.getHandle().listName);
@@ -288,42 +313,42 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -298,42 +323,42 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
}
}
@ -2380,7 +2380,7 @@ index 76160b76d7d469fb75e733c24d3f1ddf4796485e..65c54d3f52cf5977cf2274d8d5867570
this.getHandle().connection.send(packet);
}
@@ -355,6 +380,17 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -365,6 +390,17 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
this.getHandle().connection.disconnect(message == null ? "" : message);
}
@ -2398,7 +2398,7 @@ index 76160b76d7d469fb75e733c24d3f1ddf4796485e..65c54d3f52cf5977cf2274d8d5867570
@Override
public void setCompassTarget(Location loc) {
if (this.getHandle().connection == null) return;
@@ -610,6 +646,33 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -620,6 +656,33 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
this.getHandle().connection.send(packet);
}
@ -2432,7 +2432,7 @@ index 76160b76d7d469fb75e733c24d3f1ddf4796485e..65c54d3f52cf5977cf2274d8d5867570
@Override
public void sendSignChange(Location loc, String[] lines) {
this.sendSignChange(loc, lines, DyeColor.BLACK);
@@ -637,14 +700,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -647,14 +710,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
}
Component[] components = CraftSign.sanitizeLines(lines);
@ -2450,7 +2450,7 @@ index 76160b76d7d469fb75e733c24d3f1ddf4796485e..65c54d3f52cf5977cf2274d8d5867570
}
@Override
@@ -1339,7 +1403,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1425,7 +1489,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@Override
public void setResourcePack(String url) {
@ -2459,7 +2459,7 @@ index 76160b76d7d469fb75e733c24d3f1ddf4796485e..65c54d3f52cf5977cf2274d8d5867570
}
@Override
@@ -1354,7 +1418,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1440,7 +1504,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@Override
public void setResourcePack(String url, byte[] hash, boolean force) {
@ -2468,7 +2468,7 @@ index 76160b76d7d469fb75e733c24d3f1ddf4796485e..65c54d3f52cf5977cf2274d8d5867570
}
@Override
@@ -1370,6 +1434,21 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1456,6 +1520,21 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
}
}
@ -2490,7 +2490,7 @@ index 76160b76d7d469fb75e733c24d3f1ddf4796485e..65c54d3f52cf5977cf2274d8d5867570
public void addChannel(String channel) {
Preconditions.checkState(this.channels.size() < 128, "Cannot register channel '%s'. Too many channels registered!", channel);
channel = StandardMessenger.validateAndCorrectChannel(channel);
@@ -1774,6 +1853,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1860,6 +1939,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
return (this.getHandle().clientViewDistance == null) ? Bukkit.getViewDistance() : this.getHandle().clientViewDistance;
}
@ -2503,7 +2503,7 @@ index 76160b76d7d469fb75e733c24d3f1ddf4796485e..65c54d3f52cf5977cf2274d8d5867570
@Override
public int getPing() {
return this.getHandle().latency;
@@ -1819,6 +1904,194 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1905,6 +1990,194 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
return this.getHandle().allowsListing();
}
@ -2846,10 +2846,10 @@ index 6a64fbb8b4937f39d5fdc2e2cbec26c83c74c486..7d6b5fdb00a5c1614849735634262a36
public String getTitle() {
return CraftChatMessage.fromComponent(this.container.getTitle());
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
index ddcd4f2f1442d9e1b4d04c88f0f96841c4d5650d..69af359e0160480b77886ca35d8f8f3135f06455 100644
index 2e1aff425b24e1cd2197305226119f9d84574154..f4e909ca1a8518d697acabca298c387b4bde7542 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
@@ -344,4 +344,17 @@ public final class CraftItemFactory implements ItemFactory {
@@ -368,4 +368,17 @@ public final class CraftItemFactory implements ItemFactory {
public Material updateMaterial(ItemMeta meta, Material material) throws IllegalArgumentException {
return ((CraftMetaItem) meta).updateMaterial(material);
}
@ -3133,7 +3133,7 @@ index 00445fc7373c70f4cecc4114f9bcfb4b6f27c0e8..b132c151e4fb6c64b633a0712100c3ae
+ // Paper end
}
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
index 0057d6f91fd75555b59dfe25bc96a6fc21f948fa..911a732065a908545ac6a7c10262980a59bd157e 100644
index 2ac6eb382ad22b9684d460745cecfa9333ccad53..b42527e0307811a3697f6e7b0afc9a10527acbaf 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
@@ -746,6 +746,18 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {