mirror of
https://github.com/StarWishsama/Slimefun4.git
synced 2024-09-19 19:25:48 +00:00
Fixes #2664
This commit is contained in:
parent
292ed2be05
commit
aa98bd0ba2
@ -39,6 +39,7 @@
|
|||||||
* Fixed ghost blocks to some extent (ghost blocks will now drop and be replaced)
|
* Fixed ghost blocks to some extent (ghost blocks will now drop and be replaced)
|
||||||
* Fixed #2636 (hotfix)
|
* Fixed #2636 (hotfix)
|
||||||
* Fixed #2647
|
* Fixed #2647
|
||||||
|
* Fixed #2664
|
||||||
|
|
||||||
## Release Candidate 18 (03 Dec 2020)
|
## Release Candidate 18 (03 Dec 2020)
|
||||||
|
|
||||||
|
@ -673,6 +673,7 @@ public class ProgrammableAndroid extends SlimefunItem implements InventoryBlock,
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ParametersAreNonnullByDefault
|
||||||
private void executeInstruction(Instruction instruction, Block b, BlockMenu inv, Config data, int index) {
|
private void executeInstruction(Instruction instruction, Block b, BlockMenu inv, Config data, int index) {
|
||||||
if (getAndroidType().isType(instruction.getRequiredType())) {
|
if (getAndroidType().isType(instruction.getRequiredType())) {
|
||||||
String rotationData = data.getString("rotation");
|
String rotationData = data.getString("rotation");
|
||||||
@ -830,13 +831,18 @@ public class ProgrammableAndroid extends SlimefunItem implements InventoryBlock,
|
|||||||
preset.addItem(34, getFuelSource().getItem(), ChestMenuUtils.getEmptyClickHandler());
|
preset.addItem(34, getFuelSource().getItem(), ChestMenuUtils.getEmptyClickHandler());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ParametersAreNonnullByDefault
|
||||||
public void addItems(Block b, ItemStack... items) {
|
public void addItems(Block b, ItemStack... items) {
|
||||||
|
Validate.notNull(b, "The Block cannot be null.");
|
||||||
|
|
||||||
BlockMenu inv = BlockStorage.getInventory(b);
|
BlockMenu inv = BlockStorage.getInventory(b);
|
||||||
|
|
||||||
|
if (inv != null) {
|
||||||
for (ItemStack item : items) {
|
for (ItemStack item : items) {
|
||||||
inv.pushItem(item, getOutputSlots());
|
inv.pushItem(item, getOutputSlots());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
protected void move(Block b, BlockFace face, Block block) {
|
protected void move(Block b, BlockFace face, Block block) {
|
||||||
if (block.getY() > 0 && block.getY() < block.getWorld().getMaxHeight() && block.isEmpty()) {
|
if (block.getY() > 0 && block.getY() < block.getWorld().getMaxHeight() && block.isEmpty()) {
|
||||||
|
@ -68,7 +68,8 @@ public class ButcherAndroidListener implements Listener {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Some items are not dropped by default. Wither Skeleton Skulls but for some weird reason
|
* Some items are not dropped by default.
|
||||||
|
* Wither Skeleton Skulls but for some weird reason
|
||||||
* even Blaze rods...
|
* even Blaze rods...
|
||||||
*
|
*
|
||||||
* @param drops
|
* @param drops
|
||||||
|
Loading…
Reference in New Issue
Block a user