mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-03-13 19:39:04 +07:00
Code Issues Packages Projects Releases Wiki Activity

Fixed meltdown not setting blocks on fire

Browse Source
This commit is contained in:
Anuken 2018-09-16 22:13:44 -04:00
parent 2d25948c57
commit 6a7c97277f
3 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/src/io/anuke/mindustry/entities/Damage.java
View File

@ -90,7 +90,8 @@ public class Damage{
Tile tile = world.tile(cx, cy);
if(tile != null && tile.entity != null && tile.target().getTeamID() != team.ordinal() && tile.entity.collide(hitter)){
tile.entity.collision(hitter);
Effects.effect(effect, tile.worldx(), tile.worldy());
hitter.getBulletType().hit(hitter, tile.worldx(), tile.worldy());
//Effects.effect(effect, tile.worldx(), tile.worldy());
}
return false;
});

4
core/src/io/anuke/mindustry/entities/bullet/Bullet.java
View File

@ -95,6 +95,10 @@ public class Bullet extends BulletEntity<BulletType> implements TeamTrait, SyncT
create(type, null, Team.none, x, y, angle);
}
public BulletType getBulletType(){
return type;
}
public boolean collidesTiles(){
return type.collidesTiles;
}

4
core/src/io/anuke/mindustry/ui/dialogs/SectorsDialog.java
View File

@ -60,6 +60,10 @@ public class SectorsDialog extends FloatingDialog{
selected = sector;
}
public Sector getSelected(){
return selected;
}
class SectorView extends Element{
float lastX, lastY;
float sectorSize = Unit.dp.scl(32*4);