DestroyBullet (#6311)
* DestroyBullet * one space * review Co-authored-by: Lele567 <48808663+Lele567@users.noreply.github.com>
This commit is contained in:
@@ -1035,7 +1035,12 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
|
|||||||
|
|
||||||
/** Called *after* the tile has been removed. */
|
/** Called *after* the tile has been removed. */
|
||||||
public void afterDestroyed(){
|
public void afterDestroyed(){
|
||||||
|
if(block.destroyBullet != null){
|
||||||
|
//I really do not like that the bullet will not destroy derelict
|
||||||
|
//but I can't do anything about it without using a random team
|
||||||
|
//which may or may not cause issues with servers and js
|
||||||
|
block.destroyBullet.create(this, Team.derelict, x, y, 0);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/** @return the cap for item amount calculations, used when this block explodes. */
|
/** @return the cap for item amount calculations, used when this block explodes. */
|
||||||
|
|||||||
@@ -29,6 +29,7 @@ import mindustry.world.blocks.*;
|
|||||||
import mindustry.world.blocks.environment.*;
|
import mindustry.world.blocks.environment.*;
|
||||||
import mindustry.world.blocks.power.*;
|
import mindustry.world.blocks.power.*;
|
||||||
import mindustry.world.consumers.*;
|
import mindustry.world.consumers.*;
|
||||||
|
import mindustry.entities.bullet.*;
|
||||||
import mindustry.world.meta.*;
|
import mindustry.world.meta.*;
|
||||||
|
|
||||||
import java.lang.reflect.*;
|
import java.lang.reflect.*;
|
||||||
@@ -132,6 +133,8 @@ public class Block extends UnlockableContent{
|
|||||||
public int health = -1;
|
public int health = -1;
|
||||||
/** base block explosiveness */
|
/** base block explosiveness */
|
||||||
public float baseExplosiveness = 0f;
|
public float baseExplosiveness = 0f;
|
||||||
|
/** bullet that this block spawns when destroyed */
|
||||||
|
public @Nullable BulletType destroyBullet = null;
|
||||||
/** whether this block can be placed on edges of liquids. */
|
/** whether this block can be placed on edges of liquids. */
|
||||||
public boolean floating = false;
|
public boolean floating = false;
|
||||||
/** multiblock size */
|
/** multiblock size */
|
||||||
|
|||||||
Reference in New Issue
Block a user