From 634d9d1a40d553e0f90bdd3ade9ff43b87c1c7b7 Mon Sep 17 00:00:00 2001 From: Anuken Date: Sun, 17 Jan 2021 15:31:22 -0500 Subject: [PATCH] Fixed #4357 / Fixed #4349 / Fixed #4345 / Fixed #4343 --- core/src/mindustry/entities/bullet/SapBulletType.java | 2 +- core/src/mindustry/world/blocks/campaign/LaunchPad.java | 5 +++++ core/src/mindustry/world/blocks/defense/Door.java | 8 ++++---- .../mindustry/world/blocks/distribution/ItemBridge.java | 2 ++ core/src/mindustry/world/blocks/storage/CoreBlock.java | 1 + 5 files changed, 13 insertions(+), 5 deletions(-) diff --git a/core/src/mindustry/entities/bullet/SapBulletType.java b/core/src/mindustry/entities/bullet/SapBulletType.java index dbd30b77a8..b86476a9d7 100644 --- a/core/src/mindustry/entities/bullet/SapBulletType.java +++ b/core/src/mindustry/entities/bullet/SapBulletType.java @@ -19,7 +19,7 @@ public class SapBulletType extends BulletType{ public SapBulletType(){ speed = 0.0001f; despawnEffect = Fx.none; - pierce = false; + pierce = true; collides = false; hitSize = 0f; hittable = false; diff --git a/core/src/mindustry/world/blocks/campaign/LaunchPad.java b/core/src/mindustry/world/blocks/campaign/LaunchPad.java index 838efde720..f8f3ce53b0 100644 --- a/core/src/mindustry/world/blocks/campaign/LaunchPad.java +++ b/core/src/mindustry/world/blocks/campaign/LaunchPad.java @@ -76,6 +76,11 @@ public class LaunchPad extends Block{ return power != null && (block.consumes.has(ConsumeType.power) && !block.consumes.getPower().buffered) ? power.status : 1f; } + @Override + public boolean shouldConsume(){ + return true; + } + @Override public void draw(){ super.draw(); diff --git a/core/src/mindustry/world/blocks/defense/Door.java b/core/src/mindustry/world/blocks/defense/Door.java index 3546831ac8..f17ca43946 100644 --- a/core/src/mindustry/world/blocks/defense/Door.java +++ b/core/src/mindustry/world/blocks/defense/Door.java @@ -69,8 +69,8 @@ public class Door extends Wall{ super.onProximityRemoved(); for(Building b : proximity){ - if(b instanceof DoorBuild){ - ((DoorBuild)b).updateChained(); + if(b instanceof DoorBuild d){ + d.updateChained(); } } } @@ -113,8 +113,8 @@ public class Door extends Wall{ this.chained = set; for(Building b : proximity){ - if(b instanceof DoorBuild){ - ((DoorBuild)b).flow(set); + if(b instanceof DoorBuild d){ + d.flow(set); } } } diff --git a/core/src/mindustry/world/blocks/distribution/ItemBridge.java b/core/src/mindustry/world/blocks/distribution/ItemBridge.java index 605d74f880..2ab0c9b047 100644 --- a/core/src/mindustry/world/blocks/distribution/ItemBridge.java +++ b/core/src/mindustry/world/blocks/distribution/ItemBridge.java @@ -176,6 +176,8 @@ public class ItemBridge extends Block{ public void playerPlaced(Object config){ super.playerPlaced(config); + if(config != null) return; + Tile link = findLink(tile.x, tile.y); if(linkValid(tile, link) && !proximity.contains(link.build)){ link.build.configure(tile.pos()); diff --git a/core/src/mindustry/world/blocks/storage/CoreBlock.java b/core/src/mindustry/world/blocks/storage/CoreBlock.java index 7e271d798c..8767554939 100644 --- a/core/src/mindustry/world/blocks/storage/CoreBlock.java +++ b/core/src/mindustry/world/blocks/storage/CoreBlock.java @@ -384,6 +384,7 @@ public class CoreBlock extends StorageBlock{ }else if(state.rules.coreIncinerates && items.get(item) >= storageCapacity && !noEffect){ //create item incineration effect at random intervals incinerateEffect(this, source); + noEffect = false; } } }