diff --git a/core/src/io/anuke/mindustry/entities/Damage.java b/core/src/io/anuke/mindustry/entities/Damage.java index c9d593d5bf..37ff0614db 100644 --- a/core/src/io/anuke/mindustry/entities/Damage.java +++ b/core/src/io/anuke/mindustry/entities/Damage.java @@ -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; }); diff --git a/core/src/io/anuke/mindustry/entities/bullet/Bullet.java b/core/src/io/anuke/mindustry/entities/bullet/Bullet.java index 152429f1c1..3a04fc6d16 100644 --- a/core/src/io/anuke/mindustry/entities/bullet/Bullet.java +++ b/core/src/io/anuke/mindustry/entities/bullet/Bullet.java @@ -95,6 +95,10 @@ public class Bullet extends BulletEntity implements TeamTrait, SyncT create(type, null, Team.none, x, y, angle); } + public BulletType getBulletType(){ + return type; + } + public boolean collidesTiles(){ return type.collidesTiles; } diff --git a/core/src/io/anuke/mindustry/ui/dialogs/SectorsDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/SectorsDialog.java index dd532199b8..de958c89d4 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/SectorsDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/SectorsDialog.java @@ -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);