diff --git a/core/src/mindustry/core/Logic.java b/core/src/mindustry/core/Logic.java index e5dd201c59..5028ba3f12 100644 --- a/core/src/mindustry/core/Logic.java +++ b/core/src/mindustry/core/Logic.java @@ -32,10 +32,6 @@ public class Logic implements ApplicationListener{ public Logic(){ Events.on(WaveEvent.class, event -> { - for(Player p : playerGroup.all()){ - p.respawns = state.rules.respawns; - } - if(world.isZone()){ world.getZone().updateWave(state.wave); } diff --git a/core/src/mindustry/entities/def/EntityComps.java b/core/src/mindustry/entities/def/EntityComps.java index 88483beabc..6d0c8690f3 100644 --- a/core/src/mindustry/entities/def/EntityComps.java +++ b/core/src/mindustry/entities/def/EntityComps.java @@ -39,7 +39,7 @@ import java.util.*; import static mindustry.Vars.*; -@SuppressWarnings({"unused", "unused"}) +@SuppressWarnings({"unused", "unchecked"}) public class EntityComps{ @Component @@ -1331,20 +1331,14 @@ public class EntityComps{ } @Component - abstract class EffectComp implements Posc, Drawc, Timedc{ + abstract class EffectComp implements Posc, Drawc, Timedc, Rotc{ Effect effect; Color color = new Color(Color.white); Object data; - float rotation = 0f; @Override public void draw(){ - - } - - @Override - public void update(){ - //TODO fix effects, make everything poolable + effect.render(id(), color, time(), rotation(), x(), y(), data); } @Override