Fixed meltdown not setting blocks on fire
This commit is contained in:
@@ -90,7 +90,8 @@ public class Damage{
|
|||||||
Tile tile = world.tile(cx, cy);
|
Tile tile = world.tile(cx, cy);
|
||||||
if(tile != null && tile.entity != null && tile.target().getTeamID() != team.ordinal() && tile.entity.collide(hitter)){
|
if(tile != null && tile.entity != null && tile.target().getTeamID() != team.ordinal() && tile.entity.collide(hitter)){
|
||||||
tile.entity.collision(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;
|
return false;
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -95,6 +95,10 @@ public class Bullet extends BulletEntity<BulletType> implements TeamTrait, SyncT
|
|||||||
create(type, null, Team.none, x, y, angle);
|
create(type, null, Team.none, x, y, angle);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public BulletType getBulletType(){
|
||||||
|
return type;
|
||||||
|
}
|
||||||
|
|
||||||
public boolean collidesTiles(){
|
public boolean collidesTiles(){
|
||||||
return type.collidesTiles;
|
return type.collidesTiles;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -60,6 +60,10 @@ public class SectorsDialog extends FloatingDialog{
|
|||||||
selected = sector;
|
selected = sector;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public Sector getSelected(){
|
||||||
|
return selected;
|
||||||
|
}
|
||||||
|
|
||||||
class SectorView extends Element{
|
class SectorView extends Element{
|
||||||
float lastX, lastY;
|
float lastX, lastY;
|
||||||
float sectorSize = Unit.dp.scl(32*4);
|
float sectorSize = Unit.dp.scl(32*4);
|
||||||
|
|||||||
Reference in New Issue
Block a user