Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-02-10 17:42:16 +01:00
Code Issues Projects Releases Wiki Activity

Pretend to fix compile errors

Browse Source
This commit is contained in:
Bjarne Koll 2024-06-14 15:16:29 +02:00
parent d29210d668
commit be8b9314b4
3 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
patches/server/Add-Destroy-Speed-API.patch
View File

@ -20,10 +20,15 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ net.minecraft.world.item.ItemStack nmsItemStack = CraftItemStack.unwrap(itemStack); + net.minecraft.world.item.ItemStack nmsItemStack = CraftItemStack.unwrap(itemStack);
+ float speed = nmsItemStack.getDestroySpeed(this.state); + float speed = nmsItemStack.getDestroySpeed(this.state);
+ if (speed > 1.0F && considerEnchants) { + if (speed > 1.0F && considerEnchants) {
+ int enchantLevel = net.minecraft.world.item.enchantment.EnchantmentHelper.getItemEnchantmentLevel(net.minecraft.world.item.enchantment.Enchantments.EFFICIENCY, nmsItemStack); + final org.apache.commons.lang3.mutable.MutableFloat mutableFloat = new org.apache.commons.lang3.mutable.MutableFloat(0);
+ if (enchantLevel > 0) { + net.minecraft.world.item.enchantment.EnchantmentHelper.forEachModifier(
+ speed += enchantLevel * enchantLevel + 1; + nmsItemStack, net.minecraft.world.entity.EquipmentSlotGroup.MAINHAND,
+ } + (attributeHolder, attributeModifier) -> {
+ if (!attributeHolder.is(net.minecraft.world.entity.ai.attributes.Attributes.MINING_EFFICIENCY)) return;
+
+ // TODO do we just attempt to calculate the full "modifier" to the mining efficiency?
+ }
+ );
+ } + }
+ return speed; + return speed;
+ } + }

7
patches/server/Implement-enchantWithLevels-API.patch
View File

@ -24,12 +24,15 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ if (internalStack.isEnchanted()) { + if (internalStack.isEnchanted()) {
+ internalStack.set(net.minecraft.core.component.DataComponents.ENCHANTMENTS, null); + internalStack.set(net.minecraft.core.component.DataComponents.ENCHANTMENTS, null);
+ } + }
+ final net.minecraft.core.RegistryAccess registryAccess = net.minecraft.server.MinecraftServer.getServer().registryAccess();
+ final net.minecraft.core.Registry<Enchantment> enchantments = registryAccess.registryOrThrow(Registries.ENCHANTMENT);
+ final net.minecraft.world.item.ItemStack enchanted = net.minecraft.world.item.enchantment.EnchantmentHelper.enchantItem( + final net.minecraft.world.item.ItemStack enchanted = net.minecraft.world.item.enchantment.EnchantmentHelper.enchantItem(
+ MinecraftServer.getServer().getWorldData().enabledFeatures(),
+ new org.bukkit.craftbukkit.util.RandomSourceWrapper(random), + new org.bukkit.craftbukkit.util.RandomSourceWrapper(random),
+ internalStack, + internalStack,
+ levels, + levels,
+ allowTreasure + enchantments.holders()
+ .<net.minecraft.core.Holder<Enchantment>>map(r -> r)
+ .filter(r -> allowTreasure || !r.is(EnchantmentTags.TREASURE))
+ ); + );
+ return CraftItemStack.asCraftMirror(enchanted); + return CraftItemStack.asCraftMirror(enchanted);
+ } + }

2
patches/server/Implement-extended-PaperServerListPingEvent.patch
View File

@ -146,7 +146,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ +
+ // Close connection immediately if event is cancelled + // Close connection immediately if event is cancelled
+ if (event.isCancelled()) { + if (event.isCancelled()) {
+ networkManager.disconnect(null); + networkManager.disconnect((Component) null);
+ return; + return;
+ } + }
+ +