diff --git a/annotations/src/main/java/mindustry/annotations/impl/EntityProcess.java b/annotations/src/main/java/mindustry/annotations/impl/EntityProcess.java index 618b05b08b..9ab779e575 100644 --- a/annotations/src/main/java/mindustry/annotations/impl/EntityProcess.java +++ b/annotations/src/main/java/mindustry/annotations/impl/EntityProcess.java @@ -285,6 +285,7 @@ public class EntityProcess extends BaseProcessor{ //build method using same params/returns MethodSpec.Builder mbuilder = MethodSpec.methodBuilder(first.name()).addModifiers(first.is(Modifier.PRIVATE) ? Modifier.PRIVATE : Modifier.PUBLIC); if(isFinal) mbuilder.addModifiers(Modifier.FINAL); + if(first.is(Modifier.STATIC)) mbuilder.addModifiers(Modifier.STATIC); mbuilder.addTypeVariables(first.typeVariables().map(TypeVariableName::get)); mbuilder.returns(first.retn()); mbuilder.addExceptions(first.thrownt()); diff --git a/core/src/mindustry/entities/def/FireComp.java b/core/src/mindustry/entities/def/FireComp.java index 9e2a5d7e70..4f6f8b7f32 100644 --- a/core/src/mindustry/entities/def/FireComp.java +++ b/core/src/mindustry/entities/def/FireComp.java @@ -27,7 +27,6 @@ abstract class FireComp implements Timedc, Posc, Firec{ private Block block; private float baseFlammability = -1, puddleFlammability; - //TODO move these somewhere else. /** Start a fire on the tile. If there already is a file there, refreshes its lifetime. */ public static void create(Tile tile){ if(net.client() || tile == null) return; //not clientside. @@ -139,4 +138,10 @@ abstract class FireComp implements Timedc, Posc, Firec{ unit -> unit.apply(StatusEffects.burning, 60 * 5)); } } + + @Override + public void remove(){ + map.remove(tile.pos()); + } + }