Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Minor tweaks

Browse Source
This commit is contained in:
Anuken
2020-02-09 22:27:16 -05:00
parent d89189debd
commit 3feca9bbf8
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
annotations/src/main/java/mindustry/annotations/impl/EntityProcess.java
View File

@@ -285,6 +285,7 @@ public class EntityProcess extends BaseProcessor{
//build method using same params/returns //build method using same params/returns
MethodSpec.Builder mbuilder = MethodSpec.methodBuilder(first.name()).addModifiers(first.is(Modifier.PRIVATE) ? Modifier.PRIVATE : Modifier.PUBLIC); MethodSpec.Builder mbuilder = MethodSpec.methodBuilder(first.name()).addModifiers(first.is(Modifier.PRIVATE) ? Modifier.PRIVATE : Modifier.PUBLIC);
if(isFinal) mbuilder.addModifiers(Modifier.FINAL); if(isFinal) mbuilder.addModifiers(Modifier.FINAL);
if(first.is(Modifier.STATIC)) mbuilder.addModifiers(Modifier.STATIC);
mbuilder.addTypeVariables(first.typeVariables().map(TypeVariableName::get)); mbuilder.addTypeVariables(first.typeVariables().map(TypeVariableName::get));
mbuilder.returns(first.retn()); mbuilder.returns(first.retn());
mbuilder.addExceptions(first.thrownt()); mbuilder.addExceptions(first.thrownt());

7
core/src/mindustry/entities/def/FireComp.java
View File

@@ -27,7 +27,6 @@ abstract class FireComp implements Timedc, Posc, Firec{
private Block block; private Block block;
private float baseFlammability = -1, puddleFlammability; 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. */ /** Start a fire on the tile. If there already is a file there, refreshes its lifetime. */
public static void create(Tile tile){ public static void create(Tile tile){
if(net.client() || tile == null) return; //not clientside. 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)); unit -> unit.apply(StatusEffects.burning, 60 * 5));
} }
} }
@Override
public void remove(){
map.remove(tile.pos());
}
} }