mirrors/Mindustry
1
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2026-01-28 07:22:21 -08:00
Code Issues Projects Releases Wiki Activity

DestroyBullet (#6311)

Browse source 
* DestroyBullet

* one space

* review

Co-authored-by: Lele567 <48808663+Lele567@users.noreply.github.com>
This commit is contained in:
MrDuck557 2021-11-09 18:10:28 -05:00 • committed by GitHub
parent 68f8668162
commit 1c4e6b77b4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
core/src/mindustry/entities/comp/BuildingComp.java
View file

@ -1035,7 +1035,12 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
/** Called *after* the tile has been removed. */
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. */

3
core/src/mindustry/world/Block.java
View file

@ -29,6 +29,7 @@ import mindustry.world.blocks.*;
import mindustry.world.blocks.environment.*;
import mindustry.world.blocks.power.*;
import mindustry.world.consumers.*;
import mindustry.entities.bullet.*;
import mindustry.world.meta.*;
import java.lang.reflect.*;
@ -132,6 +133,8 @@ public class Block extends UnlockableContent{
public int health = -1;
/** base block explosiveness */
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. */
public boolean floating = false;
/** multiblock size */