From 5d69f6f5b543723252a89a1a264b6bcb6634f9eb Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Tue, 22 Jun 2021 00:51:44 -0500 Subject: [PATCH] fix drops from mining blocks --- build.gradle.kts | 2 +- gradle.properties | 4 ++++ .../0108-Persistent-TileEntity-Lore-and-DisplayName.patch | 4 ++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 645e07bb9..c620af52f 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -20,7 +20,7 @@ repositories { dependencies { remapper("org.quiltmc:tiny-remapper:0.4.1") - paperclip("io.papermc:paperclip:2.0.0@jar") + paperclip("io.papermc:paperclip:2.0.1") } subprojects { diff --git a/gradle.properties b/gradle.properties index e9ddfb42b..eb8b62c79 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,7 +1,11 @@ group=net.pl3x.purpur version=1.17-R0.1-SNAPSHOT + +mcVersion=1.17 packageVersion=1_17_R1 + paperCommit=40e27befc2e04a58c63b293b04ccbeea085c9dfb org.gradle.parallel=true +org.gradle.vfs.watch=false org.gradle.jvmargs=-Xmx3G diff --git a/patches/server/0108-Persistent-TileEntity-Lore-and-DisplayName.patch b/patches/server/0108-Persistent-TileEntity-Lore-and-DisplayName.patch index e90208041..f2182dc51 100644 --- a/patches/server/0108-Persistent-TileEntity-Lore-and-DisplayName.patch +++ b/patches/server/0108-Persistent-TileEntity-Lore-and-DisplayName.patch @@ -37,7 +37,7 @@ index 44b28773fe8e79931e738d493bd9405e0ee3dca9..d9114ee2ef4f1dee7ae018f932a7804a @Nullable diff --git a/src/main/java/net/minecraft/world/level/block/Block.java b/src/main/java/net/minecraft/world/level/block/Block.java -index 878cdfc49253e7916d038495f79fec7cce75aa50..7e4db08e4cec4332c9cbcc5a7cdca3e78ac1495a 100644 +index 878cdfc49253e7916d038495f79fec7cce75aa50..99d05dbe7d7d9bcc1c5f5b3dd02e413e3a398a10 100644 --- a/src/main/java/net/minecraft/world/level/block/Block.java +++ b/src/main/java/net/minecraft/world/level/block/Block.java @@ -20,6 +20,9 @@ import net.minecraft.core.IdMapper; @@ -72,7 +72,7 @@ index 878cdfc49253e7916d038495f79fec7cce75aa50..7e4db08e4cec4332c9cbcc5a7cdca3e7 if (world instanceof ServerLevel) { Block.getDrops(state, (ServerLevel) world, pos, blockEntity, entity, stack).forEach((itemstack1) -> { - Block.popResource(world, pos, itemstack1); -+ Block.popResource(world, pos, applyDisplayNameAndLoreFromTile(stack, blockEntity)); // Purpur ++ Block.popResource(world, pos, applyDisplayNameAndLoreFromTile(itemstack1, blockEntity)); // Purpur }); state.spawnAfterBreak((ServerLevel) world, pos, stack); }