OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-01-07 11:05:13 +01:00
Code Issues Projects Releases Packages Wiki Activity

SPIGOT-7010: Changing dropper item results in using dispensing behaviour

Browse source 
By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot 2022-04-28 19:16:28 +10:00
parent ed0354be30
commit 465b2801f1
2 changed files with 23 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
paper-server/nms-patches/net/minecraft/core/dispenser/DispenseBehaviorItem.patch
View file

@ -1,6 +1,6 @@
--- a/net/minecraft/core/dispenser/DispenseBehaviorItem.java --- a/net/minecraft/core/dispenser/DispenseBehaviorItem.java
+++ b/net/minecraft/core/dispenser/DispenseBehaviorItem.java +++ b/net/minecraft/core/dispenser/DispenseBehaviorItem.java
@@ -8,6 +8,12 @@ @@ -8,8 +8,22 @@
import net.minecraft.world.level.World; import net.minecraft.world.level.World;
import net.minecraft.world.level.block.BlockDispenser; import net.minecraft.world.level.block.BlockDispenser;
@ -12,14 +12,24 @@
+ +
public class DispenseBehaviorItem implements IDispenseBehavior { public class DispenseBehaviorItem implements IDispenseBehavior {
+ // CraftBukkit start
+ private boolean dropper;
+
+ public DispenseBehaviorItem(boolean dropper) {
+ this.dropper = dropper;
+ }
+ // CraftBukkit end
+
public DispenseBehaviorItem() {} public DispenseBehaviorItem() {}
@@ -26,11 +32,19 @@
@Override
@@ -26,11 +40,19 @@
IPosition iposition = BlockDispenser.getDispensePosition(isourceblock); IPosition iposition = BlockDispenser.getDispensePosition(isourceblock);
ItemStack itemstack1 = itemstack.split(1); ItemStack itemstack1 = itemstack.split(1);
- spawnItem(isourceblock.getLevel(), itemstack1, 6, enumdirection, iposition); - spawnItem(isourceblock.getLevel(), itemstack1, 6, enumdirection, iposition);
+ // CraftBukkit start + // CraftBukkit start
+ if (!spawnItem(isourceblock.getLevel(), itemstack1, 6, enumdirection, isourceblock)) { + if (!spawnItem(isourceblock.getLevel(), itemstack1, 6, enumdirection, isourceblock, dropper)) {
+ itemstack.grow(1); + itemstack.grow(1);
+ } + }
+ // CraftBukkit end + // CraftBukkit end
@ -27,15 +37,15 @@
} }
- public static void spawnItem(World world, ItemStack itemstack, int i, EnumDirection enumdirection, IPosition iposition) { - public static void spawnItem(World world, ItemStack itemstack, int i, EnumDirection enumdirection, IPosition iposition) {
+ // CraftBukkit start - void -> boolean return, IPosition -> ISourceBlock last argument + // CraftBukkit start - void -> boolean return, IPosition -> ISourceBlock last argument, dropper
+ public static boolean spawnItem(World world, ItemStack itemstack, int i, EnumDirection enumdirection, ISourceBlock isourceblock) { + public static boolean spawnItem(World world, ItemStack itemstack, int i, EnumDirection enumdirection, ISourceBlock isourceblock, boolean dropper) {
+ if (itemstack.isEmpty()) return true; + if (itemstack.isEmpty()) return true;
+ IPosition iposition = BlockDispenser.getDispensePosition(isourceblock); + IPosition iposition = BlockDispenser.getDispensePosition(isourceblock);
+ // CraftBukkit end + // CraftBukkit end
double d0 = iposition.x(); double d0 = iposition.x();
double d1 = iposition.y(); double d1 = iposition.y();
double d2 = iposition.z(); double d2 = iposition.z();
@@ -45,7 +59,39 @@ @@ -45,7 +67,39 @@
double d3 = world.random.nextDouble() * 0.1D + 0.2D; double d3 = world.random.nextDouble() * 0.1D + 0.2D;
entityitem.setDeltaMovement(world.random.nextGaussian() * 0.007499999832361937D * (double) i + (double) enumdirection.getStepX() * d3, world.random.nextGaussian() * 0.007499999832361937D * (double) i + 0.20000000298023224D, world.random.nextGaussian() * 0.007499999832361937D * (double) i + (double) enumdirection.getStepZ() * d3); entityitem.setDeltaMovement(world.random.nextGaussian() * 0.007499999832361937D * (double) i + (double) enumdirection.getStepX() * d3, world.random.nextGaussian() * 0.007499999832361937D * (double) i + 0.20000000298023224D, world.random.nextGaussian() * 0.007499999832361937D * (double) i + (double) enumdirection.getStepZ() * d3);
@ -56,7 +66,7 @@
+ entityitem.setItem(CraftItemStack.asNMSCopy(event.getItem())); + entityitem.setItem(CraftItemStack.asNMSCopy(event.getItem()));
+ entityitem.setDeltaMovement(CraftVector.toNMS(event.getVelocity())); + entityitem.setDeltaMovement(CraftVector.toNMS(event.getVelocity()));
+ +
+ if (!event.getItem().getType().equals(craftItem.getType())) { + if (!dropper && !event.getItem().getType().equals(craftItem.getType())) {
+ // Chain to handler for new item + // Chain to handler for new item
+ ItemStack eventStack = CraftItemStack.asNMSCopy(event.getItem()); + ItemStack eventStack = CraftItemStack.asNMSCopy(event.getItem());
+ IDispenseBehavior idispensebehavior = (IDispenseBehavior) BlockDispenser.DISPENSER_REGISTRY.get(eventStack.getItem()); + IDispenseBehavior idispensebehavior = (IDispenseBehavior) BlockDispenser.DISPENSER_REGISTRY.get(eventStack.getItem());

8
paper-server/nms-patches/net/minecraft/world/level/block/BlockDropper.patch
View file

@ -1,6 +1,6 @@
--- a/net/minecraft/world/level/block/BlockDropper.java --- a/net/minecraft/world/level/block/BlockDropper.java
+++ b/net/minecraft/world/level/block/BlockDropper.java +++ b/net/minecraft/world/level/block/BlockDropper.java
@@ -15,6 +15,12 @@ @@ -15,9 +15,15 @@
import net.minecraft.world.level.block.state.BlockBase; import net.minecraft.world.level.block.state.BlockBase;
import net.minecraft.world.level.block.state.IBlockData; import net.minecraft.world.level.block.state.IBlockData;
@ -12,7 +12,11 @@
+ +
public class BlockDropper extends BlockDispenser { public class BlockDropper extends BlockDispenser {
private static final IDispenseBehavior DISPENSE_BEHAVIOUR = new DispenseBehaviorItem(); - private static final IDispenseBehavior DISPENSE_BEHAVIOUR = new DispenseBehaviorItem();
+ private static final IDispenseBehavior DISPENSE_BEHAVIOUR = new DispenseBehaviorItem(true); // CraftBukkit
public BlockDropper(BlockBase.Info blockbase_info) {
super(blockbase_info);
@@ -52,8 +58,25 @@ @@ -52,8 +58,25 @@
if (iinventory == null) { if (iinventory == null) {
itemstack1 = BlockDropper.DISPENSE_BEHAVIOUR.dispense(sourceblock, itemstack); itemstack1 = BlockDropper.DISPENSE_BEHAVIOUR.dispense(sourceblock, itemstack);