Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-22 02:25:28 +01:00
Code Issues Projects Releases Wiki Activity

Updated Upstream (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

CraftBukkit Changes:
f992ce60 Fix duplicate datapack reload on /reload

Spigot Changes:
9472b09d Rebuild patches
This commit is contained in:
Jason Penilla 2021-06-15 01:38:57 -07:00
parent 89860077fa
commit 8291fff4ac
No known key found for this signature in database
GPG Key ID: 0E75A301420E48F8
32 changed files with 80 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
patches/server/0004-Paper-config-files.patch
View File

@ -689,7 +689,7 @@ index b2083d26e3b239d0f26da77955db6a34b622a1bb..90854842fda0f91ac68c70efbcf8ad9e
this.world = new CraftWorld((ServerLevel) this, gen, env);
this.ticksPerAnimalSpawns = this.getCraftServer().getTicksPerAnimalSpawns(); // CraftBukkit
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 22391e541c0289b60372dc2531416947955fc067..6345774687d4158d58be067e968c055f0c4a01bb 100644
index 7230982ee15d0584824e25aaad7b1adfe128e59a..933d5bd4b5871af83d2db5b52edac217fdf87188 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -809,6 +809,7 @@ public final class CraftServer implements Server {
@ -700,7 +700,7 @@ index 22391e541c0289b60372dc2531416947955fc067..6345774687d4158d58be067e968c055f
for (ServerLevel world : this.console.getAllLevels()) {
world.serverLevelData.setDifficulty(config.difficulty);
world.setSpawnSettings(config.spawnMonsters, config.spawnAnimals);
@@ -842,6 +843,7 @@ public final class CraftServer implements Server {
@@ -842,12 +843,14 @@ public final class CraftServer implements Server {
world.ticksPerAmbientSpawns = this.getTicksPerAmbientSpawns();
}
world.spigotConfig.init(); // Spigot
@ -708,15 +708,14 @@ index 22391e541c0289b60372dc2531416947955fc067..6345774687d4158d58be067e968c055f
}
this.pluginManager.clearPlugins();
@@ -849,6 +851,7 @@ public final class CraftServer implements Server {
this.resetRecipes();
this.commandMap.clearCommands();
this.reloadData();
org.spigotmc.SpigotConfig.registerCommands(); // Spigot
+ com.destroystokyo.paper.PaperConfig.registerCommands(); // Paper
this.overrideAllCommandBlockCommands = this.commandsConfiguration.getStringList("command-block-overrides").contains("*");
this.ignoreVanillaPermissions = this.commandsConfiguration.getBoolean("ignore-vanilla-permissions");
@@ -2106,4 +2109,35 @@ public final class CraftServer implements Server {
@@ -2105,4 +2108,35 @@ public final class CraftServer implements Server {
return this.spigot;
}
// Spigot end

8
patches/server/0009-Timings-v2.patch
View File

@ -1378,7 +1378,7 @@ index b6eb04733611b63916453f36abf2ae615786845c..2db7c62d25791bc7856d007e9197f8c8
this.entityManager.saveAll();
} else {
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index 73f6e956afd2a679ffda2e7e21485e0b1791ecdf..47195235a0aafeb7c5af090777b323a2685bcd5f 100644
index 83e71d07f86c115a0df1eb56ae9f2b127821fe80..78ef2e0d9a32d38c7193859f8ee726c70c9b289e 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -209,6 +209,7 @@ import org.bukkit.inventory.EquipmentSlot;
@ -1457,7 +1457,7 @@ index 01f3267c086837cbbc311d62974ecb034e429c23..34e386efda7ea52fb6f53333eda0f015
public UserWhiteList getWhiteList() {
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index 2ad8e9ada3ba68c107931793846b4e8284b1ab06..2bfafeec6f8a605a7826091314992e61a49e4c51 100644
index 2e90d3e79fdc5707aa5467c6270374e05b280ab3..ac1c81c964c51256c82397668b39447a36a10914 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -126,7 +126,6 @@ import org.bukkit.craftbukkit.event.CraftPortalEvent;
@ -1838,10 +1838,10 @@ index 468b67babc628f7ff7c6fa138ed7944a8d77f0a6..22d5c4cc3aea19cbf53ea320765ecceb
private static CompoundTag packStructureData(ServerLevel world, ChunkPos chunkcoordintpair, Map<StructureFeature<?>, StructureStart<?>> map, Map<StructureFeature<?>, LongSet> map1) {
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 6345774687d4158d58be067e968c055f0c4a01bb..b1b44efbe0ad16619a32991f594b928a82d53278 100644
index 933d5bd4b5871af83d2db5b52edac217fdf87188..bcd056ac91775c72809284bbc20c366e1ca31350 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2078,12 +2078,31 @@ public final class CraftServer implements Server {
@@ -2077,12 +2077,31 @@ public final class CraftServer implements Server {
private final org.bukkit.Server.Spigot spigot = new org.bukkit.Server.Spigot()
{

24
patches/server/0010-Adventure.patch
View File

@ -1140,7 +1140,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 59e58647e0650997b523a683aa52cb922a1d9c51..ab62111ebafad77c3dc739185f907a19e9f911db 100644
index 99292d239dfdd2c0aaeece2b526db011b17aa121..a8fae13b18c1619f898e818b749c02c647f164c5 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;
@ -1215,7 +1215,7 @@ index 59e58647e0650997b523a683aa52cb922a1d9c51..ab62111ebafad77c3dc739185f907a19
// CraftBukkit end
this.chatVisibility = packet.getChatVisibility();
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index 47195235a0aafeb7c5af090777b323a2685bcd5f..c58f8cf20822439098648265917801509dda1a72 100644
index 78ef2e0d9a32d38c7193859f8ee726c70c9b289e..3e89612f4bf74179b3461166b17b42af2e59b8e5 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -162,6 +162,8 @@ import org.apache.logging.log4j.LogManager;
@ -1542,7 +1542,7 @@ index d5b8931243e2f9cac9b0f92ab8df043a831bbe70..ac05b201167d8e17f39d3df732adf676
MutableComponent ichatmutablecomponent = (new TextComponent("")).append(this.getHoverName());
diff --git a/src/main/java/net/minecraft/world/item/enchantment/Enchantment.java b/src/main/java/net/minecraft/world/item/enchantment/Enchantment.java
index 75d52cc90a015588ffbbae77b4c272f938a7c0a9..6d3df3d1bcaa016611320e7ba1f005e71bf0bfdf 100644
index 5a662dd8a05be01cbb232c3dee65d660c9b19a98..07a83fc6f9a83889a0a3b8c714be68302e700a0f 100644
--- a/src/main/java/net/minecraft/world/item/enchantment/Enchantment.java
+++ b/src/main/java/net/minecraft/world/item/enchantment/Enchantment.java
@@ -95,6 +95,7 @@ public abstract class Enchantment {
@ -1575,7 +1575,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 b1b44efbe0ad16619a32991f594b928a82d53278..d2e2e0cab3035a6a458fde75e9fcf72b2d1e77dd 100644
index bcd056ac91775c72809284bbc20c366e1ca31350..e2564dee0603735d135d1de2af6801a0f2a93e7d 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -564,8 +564,10 @@ public final class CraftServer implements Server {
@ -1589,7 +1589,7 @@ index b1b44efbe0ad16619a32991f594b928a82d53278..d2e2e0cab3035a6a458fde75e9fcf72b
}
public Player getPlayer(final ServerPlayer entity) {
@@ -1310,7 +1312,15 @@ public final class CraftServer implements Server {
@@ -1309,7 +1311,15 @@ public final class CraftServer implements Server {
return this.configuration.getInt("settings.spawn-radius", -1);
}
@ -1605,7 +1605,7 @@ index b1b44efbe0ad16619a32991f594b928a82d53278..d2e2e0cab3035a6a458fde75e9fcf72b
public String getShutdownMessage() {
return this.configuration.getString("settings.shutdown-message");
}
@@ -1427,7 +1437,20 @@ public final class CraftServer implements Server {
@@ -1426,7 +1436,20 @@ public final class CraftServer implements Server {
}
@Override
@ -1626,7 +1626,7 @@ index b1b44efbe0ad16619a32991f594b928a82d53278..d2e2e0cab3035a6a458fde75e9fcf72b
Set<CommandSender> recipients = new HashSet<>();
for (Permissible permissible : this.getPluginManager().getPermissionSubscriptions(permission)) {
if (permissible instanceof CommandSender && permissible.hasPermission(permission)) {
@@ -1435,14 +1458,14 @@ public final class CraftServer implements Server {
@@ -1434,14 +1457,14 @@ public final class CraftServer implements Server {
}
}
@ -1643,7 +1643,7 @@ index b1b44efbe0ad16619a32991f594b928a82d53278..d2e2e0cab3035a6a458fde75e9fcf72b
for (CommandSender recipient : recipients) {
recipient.sendMessage(message);
@@ -1668,6 +1691,14 @@ public final class CraftServer implements Server {
@@ -1667,6 +1690,14 @@ public final class CraftServer implements Server {
return CraftInventoryCreator.INSTANCE.createInventory(owner, type);
}
@ -1658,7 +1658,7 @@ index b1b44efbe0ad16619a32991f594b928a82d53278..d2e2e0cab3035a6a458fde75e9fcf72b
@Override
public Inventory createInventory(InventoryHolder owner, InventoryType type, String title) {
Validate.isTrue(type.isCreatable(), "Cannot open an inventory of type ", type);
@@ -1680,13 +1711,28 @@ public final class CraftServer implements Server {
@@ -1679,13 +1710,28 @@ public final class CraftServer implements Server {
return CraftInventoryCreator.INSTANCE.createInventory(owner, size);
}
@ -1687,7 +1687,7 @@ index b1b44efbe0ad16619a32991f594b928a82d53278..d2e2e0cab3035a6a458fde75e9fcf72b
public Merchant createMerchant(String title) {
return new CraftMerchantCustom(title == null ? InventoryType.MERCHANT.getDefaultTitle() : title);
}
@@ -1730,6 +1776,12 @@ public final class CraftServer implements Server {
@@ -1729,6 +1775,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)
}
@ -1700,7 +1700,7 @@ index b1b44efbe0ad16619a32991f594b928a82d53278..d2e2e0cab3035a6a458fde75e9fcf72b
@Override
public String getMotd() {
return this.console.getMotd();
@@ -2158,5 +2210,15 @@ public final class CraftServer implements Server {
@@ -2157,5 +2209,15 @@ public final class CraftServer implements Server {
return null;
}
}
@ -2336,7 +2336,7 @@ index 969d5071dbf3356b80da38526351d488ab936c08..f1f35eeff46f6573b79f1190265a908e
private final Player.Spigot spigot = new Player.Spigot()
{
diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
index ad68b85f5aec00b5fc266a97880fc38c93073af3..e96ce62978e2cca454f797c4ce1ab1d306f9d7e4 100644
index e260366ca4f0ba7f37b7e78e3b46a05d91079d8d..ae12d4a7b56ec70ac5f529e0f336019e97f667ce 100644
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
@@ -787,9 +787,9 @@ public class CraftEventFactory {

4
patches/server/0023-Further-improve-server-tick-loop.patch
View File

@ -143,10 +143,10 @@ index 3a9d77a190ef96c06717ee00bcfba52b8f984c14..ca439ac2a09a2ce4e019282c0b75f2f5
this.startMetricsRecordingTick();
this.profiler.push("tick");
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index cbf84099f473115559c5344782618c2ab9c86582..4612557dfe8c81e6a9b6f11dc1c8d40eaa1337ec 100644
index f00844d2953e6ead58bfd383a214695b3dbe5086..477097955ad36b2639f6304f762a529a1989ba5e 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2126,6 +2126,17 @@ public final class CraftServer implements Server {
@@ -2125,6 +2125,17 @@ public final class CraftServer implements Server {
return CraftMagicNumbers.INSTANCE;
}

4
patches/server/0046-Expose-server-CommandMap.patch
View File

@ -5,10 +5,10 @@ Subject: [PATCH] Expose server CommandMap
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 452904333ce232855d61ff7d12cb8a5595ebb3f8..4b6e6f120edc0e2c3dd3f81c5b9fb96980e41a33 100644
index 7154b5151375574a10e079b70dbd210d698f1d27..ae810acb2d54fc589ff59bbf97e3fbf86f76955c 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1764,6 +1764,7 @@ public final class CraftServer implements Server {
@@ -1763,6 +1763,7 @@ public final class CraftServer implements Server {
return this.helpMap;
}

4
patches/server/0060-Allow-Reloading-of-Custom-Permissions.patch
View File

@ -6,10 +6,10 @@ Subject: [PATCH] Allow Reloading of Custom Permissions
https://github.com/PaperMC/Paper/issues/49
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 7e990ec783440ae7ca706bdd315305fe088a7cbe..0147b2b903e59e4689fa1a88f13c06942233379f 100644
index a9ca1e44eca6691e41c6b443f8953e77dbde62b2..610af41f33a41bd0465eace2c3e2b6ed8eeceac7 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2256,5 +2256,23 @@ public final class CraftServer implements Server {
@@ -2255,5 +2255,23 @@ public final class CraftServer implements Server {
}
return this.adventure$audiences;
}

4
patches/server/0061-Remove-Metadata-on-reload.patch
View File

@ -7,7 +7,7 @@ Metadata is not meant to persist reload as things break badly with non primitive
This will remove metadata on reload so it does not crash everything if a plugin uses it.
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 448e750974f9e15e5222ffa1c2d342c1f0a84a1e..95689d11668e37a894b70517270849c2c4e162aa 100644
index 610af41f33a41bd0465eace2c3e2b6ed8eeceac7..568777b6cad6f87f1ad7be361ebe47a6bc55cb2d 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -872,8 +872,16 @@ public final class CraftServer implements Server {
@ -24,6 +24,6 @@ index 448e750974f9e15e5222ffa1c2d342c1f0a84a1e..95689d11668e37a894b70517270849c2
+ playerMetadata.removeAll(plugin);
+ }
+ // Paper end
this.resetRecipes();
this.reloadData();
org.spigotmc.SpigotConfig.registerCommands(); // Spigot
com.destroystokyo.paper.PaperConfig.registerCommands(); // Paper

4
patches/server/0101-Add-setting-for-proxy-online-mode-status.patch
View File

@ -67,10 +67,10 @@ index 8e27b43e2f6ce4d7f5007fe02db1722e73c30a58..6aacc724c8c8d6fbe3067226989039ca
} else {
String[] astring1 = astring;
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 6deff28585dfc2f541a34f00ba2efad0f907dc71..28b64d39828ef484b6085f1cc793746d4438976d 100644
index 568777b6cad6f87f1ad7be361ebe47a6bc55cb2d..6387f01a9aeb72817988d1609188ca20b5ca4f6e 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1517,7 +1517,7 @@ public final class CraftServer implements Server {
@@ -1516,7 +1516,7 @@ public final class CraftServer implements Server {
// Spigot Start
GameProfile profile = null;
// Only fetch an online UUID in online mode

4
patches/server/0111-Allow-Reloading-of-Command-Aliases.patch
View File

@ -6,10 +6,10 @@ Subject: [PATCH] Allow Reloading of Command Aliases
Reload the aliases stored in commands.yml
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 28b64d39828ef484b6085f1cc793746d4438976d..eec2b587cc9cfb9e5d66d89c2763115e9d260cc2 100644
index 6387f01a9aeb72817988d1609188ca20b5ca4f6e..25cdff21377fdd9d3daf6af8da1f3db4ed65dab6 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2282,5 +2282,24 @@ public final class CraftServer implements Server {
@@ -2281,5 +2281,24 @@ public final class CraftServer implements Server {
DefaultPermissions.registerCorePermissions();
CraftDefaultPermissions.registerCorePermissions();
}

4
patches/server/0136-Add-configuration-option-to-prevent-player-names-fro.patch
View File

@ -20,10 +20,10 @@ index 4e2f243faa209925dcb7c3ef89df3ed875c5ff78..48319aaf1c525c6fb7bdee5c2f570a0d
+ }
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index eec2b587cc9cfb9e5d66d89c2763115e9d260cc2..ec81cbf3362202aca7c57af2ca013a7c433677f9 100644
index 25cdff21377fdd9d3daf6af8da1f3db4ed65dab6..8bd458b8995c9019b5ae85eab062df44e9424703 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2301,5 +2301,10 @@ public final class CraftServer implements Server {
@@ -2300,5 +2300,10 @@ public final class CraftServer implements Server {
commandMap.registerServerAliases();
return true;
}

6
patches/server/0137-Use-TerminalConsoleAppender-for-console-improvements.patch
View File

@ -19,7 +19,7 @@ Other changes:
configuration
diff --git a/build.gradle.kts b/build.gradle.kts
index e7fdc8ee6024608605fe04b9df851c17cd615e10..ce7c6a3604e11642c27cbb645ee648dc2f8d6701 100644
index 07be9eb1dd7f0f85e8a36cc4e8df807bae989372..2d016978c4e2ee2d222b177ccdb1f356ffd60db1 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -21,7 +21,17 @@ repositories {
@ -244,7 +244,7 @@ index 79ebb15bed6eec80c12c1020b2b6b07c758332aa..bf6c3ac7ae37067f345568fb6656cf6b
this.bans = new UserBanList(PlayerList.USERBANLIST_FILE);
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index ec81cbf3362202aca7c57af2ca013a7c433677f9..ebc3cba0b221a98bd4a5f831dafa856594d0c0bd 100644
index 8bd458b8995c9019b5ae85eab062df44e9424703..79fe58b09c9e0870a5ab55bc21b8ab933450a1d7 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -46,7 +46,6 @@ import java.util.function.Consumer;
@ -263,7 +263,7 @@ index ec81cbf3362202aca7c57af2ca013a7c433677f9..ebc3cba0b221a98bd4a5f831dafa8565
import net.minecraft.server.MinecraftServer;
import net.minecraft.server.bossevents.CustomBossEvent;
import net.minecraft.server.commands.ReloadCommand;
@@ -1205,9 +1205,13 @@ public final class CraftServer implements Server {
@@ -1204,9 +1204,13 @@ public final class CraftServer implements Server {
return this.logger;
}

4
patches/server/0143-Basic-PlayerProfile-API.patch
View File

@ -500,7 +500,7 @@ index 3eb4bee81a8543cc06b9d5898f5f6c0e9dbbf554..8ea7d9a2070074a45d3276b8d2abac62
public GameProfile get(UUID uuid) {
GameProfileCache.GameProfileInfo usercache_usercacheentry = (GameProfileCache.GameProfileInfo) this.profilesByUUID.get(uuid);
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 76856f3648e8cb881653a94bf6e8e4310c97be2d..754e10be4f62ee3efac34bea3c72e23b1b06053c 100644
index 2f25e4c26f2f418de738ba2fcf7f2485bb2dda3c..46972308cf399ed02c450bc2d45b4dc88b234ab0 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -226,6 +226,9 @@ import org.yaml.snakeyaml.error.MarkedYAMLException;
@ -513,7 +513,7 @@ index 76856f3648e8cb881653a94bf6e8e4310c97be2d..754e10be4f62ee3efac34bea3c72e23b
public final class CraftServer implements Server {
private final String serverName = "Paper"; // Paper
private final String serverVersion;
@@ -2316,5 +2319,24 @@ public final class CraftServer implements Server {
@@ -2315,5 +2318,24 @@ public final class CraftServer implements Server {
public boolean suggestPlayerNamesWhenNullTabCompletions() {
return com.destroystokyo.paper.PaperConfig.suggestPlayersWhenNullTabCompletions;
}

6
patches/server/0168-AsyncTabCompleteEvent.patch
View File

@ -14,7 +14,7 @@ completion, such as offline players.
Also adds isCommand and getLocation to the sync TabCompleteEvent
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index 985736fc4e3d702a1fd787336db8ab18ee2a4783..5b426265d62063544f0104c8c9f8061d002bc56c 100644
index c2f614b64482be75b28d47e79b0531a9143a157d..413bf8504821d4605e940f865332e8dd77acb436 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -703,10 +703,10 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
@ -72,10 +72,10 @@ index 985736fc4e3d702a1fd787336db8ab18ee2a4783..5b426265d62063544f0104c8c9f8061d
@Override
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 754e10be4f62ee3efac34bea3c72e23b1b06053c..8e93f6398a5974676a479e17f31a8e77c461fb41 100644
index 46972308cf399ed02c450bc2d45b4dc88b234ab0..c7dbe127e30cc6830794c3a81686908f076160ac 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1851,7 +1851,7 @@ public final class CraftServer implements Server {
@@ -1850,7 +1850,7 @@ public final class CraftServer implements Server {
offers = this.tabCompleteChat(player, message);
}

4
patches/server/0186-getPlayerUniqueId-API.patch
View File

@ -9,10 +9,10 @@ In Offline Mode, will return an Offline UUID
This is a more performant way to obtain a UUID for a name than loading an OfflinePlayer
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 8e93f6398a5974676a479e17f31a8e77c461fb41..b12fb31d9a601c1781b0cb0a24bdd9cbcc4f382b 100644
index c7dbe127e30cc6830794c3a81686908f076160ac..8f2c7ca033a7c162395b6e5114895836e10534ab 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1519,6 +1519,25 @@ public final class CraftServer implements Server {
@@ -1518,6 +1518,25 @@ public final class CraftServer implements Server {
return recipients.size();
}

4
patches/server/0244-Add-Early-Warning-Feature-to-WatchDog.patch
View File

@ -48,7 +48,7 @@ index 050b27be1c25764d65e5340149718e858b3aeb2e..880fc4e346549a5d7ed627244bdfd284
long start = System.nanoTime(), curTime, tickSection = start; // Paper - Further improve server tick loop
lastTick = start - TICK_TIME; // Paper
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index b12fb31d9a601c1781b0cb0a24bdd9cbcc4f382b..16645b4c096936c4d5c00f335e5cdb7dd4a4e2bd 100644
index 8f2c7ca033a7c162395b6e5114895836e10534ab..e22b073a7a5f35a8edf58946144d1f1e9d94b6e3 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -810,6 +810,7 @@ public final class CraftServer implements Server {
@ -59,7 +59,7 @@ index b12fb31d9a601c1781b0cb0a24bdd9cbcc4f382b..16645b4c096936c4d5c00f335e5cdb7d
this.reloadCount++;
this.configuration = YamlConfiguration.loadConfiguration(this.getConfigFile());
this.commandsConfiguration = YamlConfiguration.loadConfiguration(this.getCommandsConfigFile());
@@ -926,6 +927,7 @@ public final class CraftServer implements Server {
@@ -925,6 +926,7 @@ public final class CraftServer implements Server {
this.enablePlugins(PluginLoadOrder.STARTUP);
this.enablePlugins(PluginLoadOrder.POSTWORLD);
this.getPluginManager().callEvent(new ServerLoadEvent(ServerLoadEvent.LoadType.RELOAD));

4
patches/server/0293-Make-the-default-permission-message-configurable.patch
View File

@ -30,10 +30,10 @@ index 9768c591e72ce2ef5fdb43e2fc63378c57773216..11d628869a9a6eda8bf21a4f213ff23a
Object val = config.get("settings.save-player-data");
if (val instanceof Boolean) {
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 717ad1c24bbc882db8f76cfef7bf847c58914e5a..0448e6b4c512f512bda13f41f1feb58de02fc9d4 100644
index 7f1d5725e156b9cf3273aa0f66c1e0d486df6a51..d9bfaff4880de1254a72869562b4c42aa29146f1 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2341,6 +2341,11 @@ public final class CraftServer implements Server {
@@ -2340,6 +2340,11 @@ public final class CraftServer implements Server {
return com.destroystokyo.paper.PaperConfig.suggestPlayersWhenNullTabCompletions;
}

4
patches/server/0327-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch
View File

@ -29,10 +29,10 @@ index eb103c15218c334b9f85a57e30582e9efb188704..c8a59de4673d430fc8ec2e53315f1072
public boolean isDebugging() {
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 0448e6b4c512f512bda13f41f1feb58de02fc9d4..58d7fec472dd8c8d7775eb6d931be29871102054 100644
index d9bfaff4880de1254a72869562b4c42aa29146f1..334ea92dd16bf325961afd92e835e63163cbcecb 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1840,7 +1840,7 @@ public final class CraftServer implements Server {
@@ -1839,7 +1839,7 @@ public final class CraftServer implements Server {
@Override
public boolean isPrimaryThread() {

4
patches/server/0344-Expose-the-internal-current-tick.patch
View File

@ -5,10 +5,10 @@ Subject: [PATCH] Expose the internal current tick
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 58d7fec472dd8c8d7775eb6d931be29871102054..9730c701b734eb3491bc1fa5d9bb81ddfefc910a 100644
index 334ea92dd16bf325961afd92e835e63163cbcecb..39e6db52421528f16ac4595faa8cfcf191771c77 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2364,5 +2364,10 @@ public final class CraftServer implements Server {
@@ -2363,5 +2363,10 @@ public final class CraftServer implements Server {
}
return new com.destroystokyo.paper.profile.CraftPlayerProfile(uuid, name);
}

4
patches/server/0395-Add-tick-times-API-and-mspt-command.patch
View File

@ -146,10 +146,10 @@ index fa3a9d763f7072c68b126ce95fee191aab576e43..91ae80ee1020dc017faef7c8be848713
+ // Paper end
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 9730c701b734eb3491bc1fa5d9bb81ddfefc910a..6eebbe2d7948a164f9562801b727768d199fa228 100644
index 39e6db52421528f16ac4595faa8cfcf191771c77..bc5034eff1e9d41c97a210b3b53c188395cb2574 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2202,6 +2202,16 @@ public final class CraftServer implements Server {
@@ -2201,6 +2201,16 @@ public final class CraftServer implements Server {
net.minecraft.server.MinecraftServer.getServer().tps15.getAverage()
};
}

4
patches/server/0396-Expose-MinecraftServer-isRunning.patch
View File

@ -6,10 +6,10 @@ Subject: [PATCH] Expose MinecraftServer#isRunning
This allows for plugins to detect if the server is actually turning off in onDisable rather than just plugins reloading.
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 6eebbe2d7948a164f9562801b727768d199fa228..3423de396e0fadfa29714f5fcac4b579a8ff0967 100644
index bc5034eff1e9d41c97a210b3b53c188395cb2574..2c8c800f04793493515782722d706db6e5f861af 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2379,5 +2379,10 @@ public final class CraftServer implements Server {
@@ -2378,5 +2378,10 @@ public final class CraftServer implements Server {
public int getCurrentTick() {
return net.minecraft.server.MinecraftServer.currentTick;
}

4
patches/server/0400-Improved-Watchdog-Support.patch
View File

@ -323,10 +323,10 @@ index 59a77541bbda880ae8f84e3535a2b6112caa78fb..a63dc77db41dab79f03ef7384da55c1c
String msg = "TileEntity threw exception at " + LevelChunk.this.getLevel().getWorld().getName() + ":" + this.getPos().getX() + "," + this.getPos().getY() + "," + this.getPos().getZ();
System.err.println(msg);
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 3423de396e0fadfa29714f5fcac4b579a8ff0967..4c0b94a56fab161fca92b594f55e1c846524d5e8 100644
index 2c8c800f04793493515782722d706db6e5f861af..e31a05dfe7e934692ac89c7cedcab736bcd9ca4f 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1840,7 +1840,7 @@ public final class CraftServer implements Server {
@@ -1839,7 +1839,7 @@ public final class CraftServer implements Server {
@Override
public boolean isPrimaryThread() {

4
patches/server/0427-Implement-Mob-Goal-API.patch
View File

@ -933,10 +933,10 @@ index bcb2c5480872eef6f21746003380f71b8d44f5c8..bcd0da029edd9b1d6f3617ee20dac00c
private final EnumSet<Goal.Flag> disabledFlags = EnumSet.noneOf(Goal.Flag.class); // Paper unused, but dummy to prevent plugins from crashing as hard. Theyll need to support paper in a special case if this is super important, but really doesn't seem like it would be.
private final com.destroystokyo.paper.util.set.OptimizedSmallEnumSet<net.minecraft.world.entity.ai.goal.Goal.Flag> goalTypes = new com.destroystokyo.paper.util.set.OptimizedSmallEnumSet<>(Goal.Flag.class); // Paper - remove streams from pathfindergoalselector
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 479b4eb8efeeca432bcb21925db18d5c0750f001..4d6a6583af73a25b5f2783ba56a63b8c9987c0a4 100644
index 130ab05393a7136020e06ec199256a031ba66091..8dd93620a770855450ed222dad6572e20760b08c 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2391,5 +2391,11 @@ public final class CraftServer implements Server {
@@ -2390,5 +2390,11 @@ public final class CraftServer implements Server {
public boolean isStopping() {
return net.minecraft.server.MinecraftServer.getServer().hasStopped();
}

4
patches/server/0436-Wait-for-Async-Tasks-during-shutdown.patch
View File

@ -22,10 +22,10 @@ index d7023cb0974f6c28a0fb8a0a6e5a6600fe30d3e3..11dbe48c8a8c29cd28d725c43505e326
// CraftBukkit end
if (this.getConnection() != null) {
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 4d6a6583af73a25b5f2783ba56a63b8c9987c0a4..94670ec4de01341822f6affe0fa1c9774dd6131b 100644
index 8dd93620a770855450ed222dad6572e20760b08c..e3338717bffe5f5e4a00fe1ebe3ba7cf74555b36 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -937,6 +937,35 @@ public final class CraftServer implements Server {
@@ -936,6 +936,35 @@ public final class CraftServer implements Server {
org.spigotmc.WatchdogThread.hasStarted = true; // Paper - Disable watchdog early timeout on reload
}

4
patches/server/0480-Allow-delegation-to-vanilla-chunk-gen.patch
View File

@ -5,10 +5,10 @@ Subject: [PATCH] Allow delegation to vanilla chunk gen
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 6bc5ba51c90723c7138b1b5d2381cb215f1e5271..beb8b7d06ef47c80ede95c884598fedcc7126d67 100644
index f7d542b828904fb51a30dfb7a50e01e4e2df0f3e..407a91f64e040745dea17544d6b7c6d125866c62 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2033,6 +2033,32 @@ public final class CraftServer implements Server {
@@ -2032,6 +2032,32 @@ public final class CraftServer implements Server {
return new CraftChunkData(world);
}

4
patches/server/0536-Add-getOfflinePlayerIfCached-String.patch
View File

@ -5,10 +5,10 @@ Subject: [PATCH] Add getOfflinePlayerIfCached(String)
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 7795735e5acc3b7b6b71b4e61bdc4bdcb722a7b3..ecae20bb39848cc0223df3c4804a68f4e0731e3b 100644
index c4d7ac8abd7d86e8a4e2d8a3340d04f8710e925c..0d29e3163a637c742d100129cb650f53635ef765 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1613,6 +1613,28 @@ public final class CraftServer implements Server {
@@ -1612,6 +1612,28 @@ public final class CraftServer implements Server {
return result;
}

4
patches/server/0598-Added-Vanilla-Entity-Tags.patch
View File

@ -39,10 +39,10 @@ index 0000000000000000000000000000000000000000..6271586368c65250c887739d04c5fccf
+ }
+}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index ecae20bb39848cc0223df3c4804a68f4e0731e3b..726db110f27ce46b8ed9c78dad14542bba1622a8 100644
index 0d29e3163a637c742d100129cb650f53635ef765..4739b4c3035064de328595329ee0b65ea59e559b 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2222,6 +2222,11 @@ public final class CraftServer implements Server {
@@ -2221,6 +2221,11 @@ public final class CraftServer implements Server {
Preconditions.checkArgument(clazz == org.bukkit.Fluid.class, "Fluid namespace must have fluid type");
return (org.bukkit.Tag<T>) new CraftFluidTag(FluidTags.getAllTags(), key);

4
patches/server/0616-misc-debugging-dumps.patch
View File

@ -58,10 +58,10 @@ index c8213692e658f6eb82d3bd843b9525ff6565cc81..f1c1d715d509aeb13e465cd57a82896d
this.running = false;
if (flag) {
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 726db110f27ce46b8ed9c78dad14542bba1622a8..40496bc7b1ce71c898078f7713600ac05922dcf1 100644
index 4739b4c3035064de328595329ee0b65ea59e559b..989b6b91dc046e20332f0cef35105b290fdb2e43 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -936,6 +936,7 @@ public final class CraftServer implements Server {
@@ -935,6 +935,7 @@ public final class CraftServer implements Server {
plugin.getDescription().getName(),
"This plugin is not properly shutting down its async tasks when it is being reloaded. This may cause conflicts with the newly loaded version of the plugin"
));

6
patches/server/0631-Implement-Keyed-on-World.patch
View File

@ -5,10 +5,10 @@ Subject: [PATCH] Implement Keyed on World
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 40496bc7b1ce71c898078f7713600ac05922dcf1..bd7db12503c3175c3bd71f8a0fe3a826eb043000 100644
index 989b6b91dc046e20332f0cef35105b290fdb2e43..fb18b1f0bbc5b87f6895086f6d6a749543caf11f 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1155,7 +1155,7 @@ public final class CraftServer implements Server {
@@ -1154,7 +1154,7 @@ public final class CraftServer implements Server {
} else if (name.equals(levelName + "_the_end")) {
worldKey = net.minecraft.world.level.Level.END;
} else {
@ -17,7 +17,7 @@ index 40496bc7b1ce71c898078f7713600ac05922dcf1..bd7db12503c3175c3bd71f8a0fe3a826
}
ServerLevel internal = (ServerLevel) new ServerLevel(this.console, console.executor, worldSession, worlddata, worldKey, dimensionmanager, this.getServer().progressListenerFactory.create(11),
@@ -1246,6 +1246,15 @@ public final class CraftServer implements Server {
@@ -1245,6 +1245,15 @@ public final class CraftServer implements Server {
return null;
}

4
patches/server/0670-Add-basic-Datapack-API.patch
View File

@ -92,7 +92,7 @@ index 0000000000000000000000000000000000000000..cf4374493c11057451a62a655514415c
+ }
+}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index bd7db12503c3175c3bd71f8a0fe3a826eb043000..2f914ebd18764fbfd3834c0a94cedb2184f8dbb0 100644
index fb18b1f0bbc5b87f6895086f6d6a749543caf11f..b7db2d68deeee0a213ee26e31475f05ba16d073e 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -266,6 +266,7 @@ public final class CraftServer implements Server {
@ -111,7 +111,7 @@ index bd7db12503c3175c3bd71f8a0fe3a826eb043000..2f914ebd18764fbfd3834c0a94cedb21
}
public boolean getCommandBlockOverride(String command) {
@@ -2496,5 +2498,11 @@ public final class CraftServer implements Server {
@@ -2495,5 +2497,11 @@ public final class CraftServer implements Server {
public com.destroystokyo.paper.entity.ai.MobGoals getMobGoals() {
return mobGoals;
}

6
patches/server/0676-Fix-and-optimise-world-force-upgrading.patch
View File

@ -349,10 +349,10 @@ index 1bee455235ece8aa299a2baeede027d251e6ff57..60ae9395591c81aebaa4be1541380a8f
return this.regionCache.getAndMoveToFirst(ChunkPos.asLong(chunkcoordintpair.getRegionX(), chunkcoordintpair.getRegionZ()));
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 59c352f9666ff9b828450a62f590ab637b4329b5..e5135b5cffc39fa63cb9a78274c026a0b5fddaf8 100644
index ca28dda0f9819e8d75fbaa48cf5ff5643910999a..8a98bd1018afd934696fedbed24e271ab6b75f51 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1143,14 +1143,7 @@ public final class CraftServer implements Server {
@@ -1142,14 +1142,7 @@ public final class CraftServer implements Server {
}
worlddata.checkName(name);
worlddata.setModdedInfo(this.console.getServerModName(), this.console.getModdedStatus().isPresent());
@ -368,7 +368,7 @@ index 59c352f9666ff9b828450a62f590ab637b4329b5..e5135b5cffc39fa63cb9a78274c026a0
long j = BiomeManager.obfuscateSeed(creator.seed());
List<CustomSpawner> list = ImmutableList.of(new PhantomSpawner(), new PatrolSpawner(), new CatSpawner(), new VillageSiege(), new WanderingTraderSpawner(worlddata));
@@ -1167,6 +1160,14 @@ public final class CraftServer implements Server {
@@ -1166,6 +1159,14 @@ public final class CraftServer implements Server {
chunkgenerator = worlddimension.generator();
}

2
work/CraftBukkit

@ -1 +1 @@
Subproject commit 622cf6111905e787add191b9a88d62656439ef31
Subproject commit f992ce6097f846ed5967fc797d98ae3e84ef1b10

2
work/Spigot

@ -1 +1 @@
Subproject commit 66f9d3c17bd578dacbb87702cc0347148696e105
Subproject commit 9472b09d5fa46afc41871d063689b5ddd89764b3