Fixed #3540 / Fixed #3544 / Fixed #3542

This commit is contained in:
Anuken
2020-11-23 09:12:36 -05:00
parent 8d91a9b014
commit 075be1a862
10 changed files with 25 additions and 16 deletions
@@ -58,7 +58,7 @@ public class LaunchPad extends Block{
@Override
public Cursor getCursor(){
return !state.isCampaign() ? SystemCursor.arrow : super.getCursor();
return !state.isCampaign() || net.client() ? SystemCursor.arrow : super.getCursor();
}
@Override
@@ -136,7 +136,7 @@ public class LaunchPad extends Block{
@Override
public void buildConfiguration(Table table){
if(!state.isCampaign()){
if(!state.isCampaign() || net.client()){
deselect();
return;
}
@@ -234,7 +234,9 @@ public class LaunchPad extends Block{
Events.fire(new LaunchItemEvent(stack));
}
destsec.addItems(dest);
if(!net.client()){
destsec.addItems(dest);
}
}
}
}
@@ -50,7 +50,7 @@ public class Junction extends Block{
Building dest = nearby(i);
//skip blocks that don't want the item, keep waiting until they do
if(dest == null || !dest.acceptItem(this, item) || dest.team != team){
if(item == null || dest == null || !dest.acceptItem(this, item) || dest.team != team){
continue;
}
@@ -144,7 +144,7 @@ public class CoreBlock extends StorageBlock{
//right before placing, create a "destination" item array which is all the previous items minus core requirements
ItemModule items = tile.build.items.copy();
if(!state.rules.infiniteResources){
items.remove(requirements);
items.remove(ItemStack.mult(requirements, state.rules.buildCostMultiplier));
}
nextItems = items;
@@ -157,7 +157,7 @@ public class CoreBlock extends StorageBlock{
if(!canPlaceOn(world.tile(x, y), player.team())){
drawPlaceText(Core.bundle.get((player.team().core() != null && player.team().core().items.has(requirements)) || state.rules.infiniteResources ?
drawPlaceText(Core.bundle.get((player.team().core() != null && player.team().core().items.has(requirements, state.rules.buildCostMultiplier)) || state.rules.infiniteResources ?
"bar.corereq" :
"bar.noresources"
), x, y, valid);