aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/0430-Fix-item-locations-dropped-from-campfires.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/server/0430-Fix-item-locations-dropped-from-campfires.patch')
-rw-r--r--patches/server/0430-Fix-item-locations-dropped-from-campfires.patch28
1 files changed, 28 insertions, 0 deletions
diff --git a/patches/server/0430-Fix-item-locations-dropped-from-campfires.patch b/patches/server/0430-Fix-item-locations-dropped-from-campfires.patch
new file mode 100644
index 0000000000..65034de65e
--- /dev/null
+++ b/patches/server/0430-Fix-item-locations-dropped-from-campfires.patch
@@ -0,0 +1,28 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: William Blake Galbreath <[email protected]>
+Date: Sat, 3 Oct 2020 20:32:25 -0500
+Subject: [PATCH] Fix item locations dropped from campfires
+
+Fixes #4259 by not flooring the blockposition among other weirdness
+Vanilla Issue: MC-267622
+
+diff --git a/src/main/java/net/minecraft/world/level/block/entity/CampfireBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/CampfireBlockEntity.java
+index 0de294a2aec50a39d6dbc56b6a61b01b1e538828..66fbad74c2ec2f853ec6c74482c6cae1c1746007 100644
+--- a/src/main/java/net/minecraft/world/level/block/entity/CampfireBlockEntity.java
++++ b/src/main/java/net/minecraft/world/level/block/entity/CampfireBlockEntity.java
+@@ -87,7 +87,14 @@ public class CampfireBlockEntity extends BlockEntity implements Clearable {
+ result = blockCookEvent.getResult();
+ itemstack1 = CraftItemStack.asNMSCopy(result);
+ // CraftBukkit end
+- Containers.dropItemStack(world, (double) pos.getX(), (double) pos.getY(), (double) pos.getZ(), itemstack1);
++ // Paper start - Fix item locations dropped from campfires
++ double deviation = 0.05F * RandomSource.GAUSSIAN_SPREAD_FACTOR;
++ while (!itemstack1.isEmpty()) {
++ net.minecraft.world.entity.item.ItemEntity droppedItem = new net.minecraft.world.entity.item.ItemEntity(world, pos.getX() + 0.5D, pos.getY() + 0.5D, pos.getZ() + 0.5D, itemstack1.split(world.random.nextInt(21) + 10));
++ droppedItem.setDeltaMovement(world.random.triangle(0.0D, deviation), world.random.triangle(0.2D, deviation), world.random.triangle(0.0D, deviation));
++ world.addFreshEntity(droppedItem);
++ }
++ // Paper end - Fix item locations dropped from campfires
+ campfire.items.set(i, ItemStack.EMPTY);
+ world.sendBlockUpdated(pos, state, state, 3);
+ world.gameEvent((Holder) GameEvent.BLOCK_CHANGE, pos, GameEvent.Context.of(state));