From 744d863fe9d9712dabd11f0f7a84d6492ad3aa81 Mon Sep 17 00:00:00 2001 From: Patrick 'Quezler' Mounier Date: Mon, 30 Dec 2019 13:03:48 +0100 Subject: [PATCH] Move crater critter creator --- core/src/mindustry/entities/type/base/CraterUnit.java | 9 +++++++++ .../world/blocks/distribution/CompressedConveyor.java | 6 +----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/core/src/mindustry/entities/type/base/CraterUnit.java b/core/src/mindustry/entities/type/base/CraterUnit.java index 186ae78ae7..9d8c91da19 100644 --- a/core/src/mindustry/entities/type/base/CraterUnit.java +++ b/core/src/mindustry/entities/type/base/CraterUnit.java @@ -103,6 +103,15 @@ public class CraterUnit extends GroundUnit{ return false; // it has its own logic } + public static CraterUnit on(Tile tile){ // summons a crater on said tile + CraterUnit crater = (CraterUnit)UnitTypes.crater.create(tile.getTeam()); + crater.set(tile.drawx(), tile.drawy()); + crater.rotation = tile.rotation() * 90; + crater.add(); + Events.fire(new UnitCreateEvent(crater)); + return crater; + } + public boolean on(Track track){ return track.check.get(on()); } diff --git a/core/src/mindustry/world/blocks/distribution/CompressedConveyor.java b/core/src/mindustry/world/blocks/distribution/CompressedConveyor.java index 34b2463b0f..b375dc8e2e 100644 --- a/core/src/mindustry/world/blocks/distribution/CompressedConveyor.java +++ b/core/src/mindustry/world/blocks/distribution/CompressedConveyor.java @@ -71,11 +71,7 @@ public class CompressedConveyor extends ArmoredConveyor{ if(entity.crater == null || entity.crater.dead || !entity.crater.loading() || entity.crater.on() != tile){ if(entity.reload > 0) return false; entity.reload = cooldown; - entity.crater = (CraterUnit)UnitTypes.crater.create(tile.getTeam()); - entity.crater.set(tile.drawx(), tile.drawy()); - entity.crater.rotation = tile.rotation() * 90; - entity.crater.add(); - Events.fire(new UnitCreateEvent(entity.crater)); + entity.crater = CraterUnit.on(tile); } return entity.crater.acceptItem(item);