This commit is contained in:
Anuken
2020-07-30 14:24:23 -04:00
parent b46a8263ba
commit 99fafc47f2
9 changed files with 88 additions and 59 deletions
@@ -177,22 +177,17 @@ public class LaunchPad extends Block{
//actually launch the items upon removal
if(team() == state.rules.defaultTeam && state.secinfo.origin != null){
Seq<ItemStack> dest = state.secinfo.origin.getReceivedItems();
ItemSeq dest = state.secinfo.origin.getExtraItems();
for(ItemStack stack : stacks){
ItemStack sto = dest.find(i -> i.item == stack.item);
if(sto != null){
sto.amount += stack.amount;
}else{
dest.add(stack);
}
dest.add(stack);
//update export
state.secinfo.handleItemExport(stack);
Events.fire(new LaunchItemEvent(stack));
}
state.secinfo.origin.setReceivedItems(dest);
state.secinfo.origin.setExtraItems(dest);
}
}
}
@@ -134,6 +134,8 @@ public class ItemBridge extends Block{
@Override
public void playerPlaced(){
super.playerPlaced();
Tile link = findLink(tile.x, tile.y);
if(linkValid(tile, link)){
link.build.configure(tile.pos());
@@ -128,12 +128,15 @@ public class OverflowGate extends Block{
@Override
public void write(Writes write){
super.write(write);
write.i(lastInput == null ? -1 : lastInput.pos());
}
@Override
public void read(Reads read, byte revision){
super.read(read, revision);
if(revision == 1){
new DirectionalItemBuffer(25).read(read);
}else if(revision == 3){