Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed #4357 / Fixed #4349 / Fixed #4345 / Fixed #4343

Browse Source
This commit is contained in:
Anuken
2021-01-17 15:31:22 -05:00
parent f9adcfeed1
commit 634d9d1a40
5 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/mindustry/entities/bullet/SapBulletType.java
View File

@@ -19,7 +19,7 @@ public class SapBulletType extends BulletType{
public SapBulletType(){ public SapBulletType(){
speed = 0.0001f; speed = 0.0001f;
despawnEffect = Fx.none; despawnEffect = Fx.none;
pierce = false; pierce = true;
collides = false; collides = false;
hitSize = 0f; hitSize = 0f;
hittable = false; hittable = false;

5
core/src/mindustry/world/blocks/campaign/LaunchPad.java
View File

@@ -76,6 +76,11 @@ public class LaunchPad extends Block{
return power != null && (block.consumes.has(ConsumeType.power) && !block.consumes.getPower().buffered) ? power.status : 1f; return power != null && (block.consumes.has(ConsumeType.power) && !block.consumes.getPower().buffered) ? power.status : 1f;
} }
@Override
public boolean shouldConsume(){
return true;
}
@Override @Override
public void draw(){ public void draw(){
super.draw(); super.draw();

8
core/src/mindustry/world/blocks/defense/Door.java
View File

@@ -69,8 +69,8 @@ public class Door extends Wall{
super.onProximityRemoved(); super.onProximityRemoved();
for(Building b : proximity){ for(Building b : proximity){
if(b instanceof DoorBuild){ if(b instanceof DoorBuild d){
((DoorBuild)b).updateChained(); d.updateChained();
} }
} }
} }
@@ -113,8 +113,8 @@ public class Door extends Wall{
this.chained = set; this.chained = set;
for(Building b : proximity){ for(Building b : proximity){
if(b instanceof DoorBuild){ if(b instanceof DoorBuild d){
((DoorBuild)b).flow(set); d.flow(set);
} }
} }
} }

2
core/src/mindustry/world/blocks/distribution/ItemBridge.java
View File

@@ -176,6 +176,8 @@ public class ItemBridge extends Block{
public void playerPlaced(Object config){ public void playerPlaced(Object config){
super.playerPlaced(config); super.playerPlaced(config);
if(config != null) return;
Tile link = findLink(tile.x, tile.y); Tile link = findLink(tile.x, tile.y);
if(linkValid(tile, link) && !proximity.contains(link.build)){ if(linkValid(tile, link) && !proximity.contains(link.build)){
link.build.configure(tile.pos()); link.build.configure(tile.pos());

1
core/src/mindustry/world/blocks/storage/CoreBlock.java
View File

@@ -384,6 +384,7 @@ public class CoreBlock extends StorageBlock{
}else if(state.rules.coreIncinerates && items.get(item) >= storageCapacity && !noEffect){ }else if(state.rules.coreIncinerates && items.get(item) >= storageCapacity && !noEffect){
//create item incineration effect at random intervals //create item incineration effect at random intervals
incinerateEffect(this, source); incinerateEffect(this, source);
noEffect = false;
} }
} }
} }