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

what

Browse Source
This commit is contained in:
Anuken
2020-09-13 23:30:51 -04:00
parent 3f1ed6d4a4
commit 5c63ff889a
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
annotations/src/main/java/mindustry/annotations/impl/CallSuperProcess.java
View File

@@ -68,9 +68,9 @@ public class CallSuperProcess extends AbstractProcessor{
} }
static class CodeAnalyzerTreeScanner extends TreePathScanner<Object, Trees>{ static class CodeAnalyzerTreeScanner extends TreePathScanner<Object, Trees>{
private String methodName; String methodName;
private MethodTree method; MethodTree method;
private boolean callSuperUsed; boolean callSuperUsed;
@Override @Override
public Object visitClass(ClassTree classTree, Trees trees){ public Object visitClass(ClassTree classTree, Trees trees){
@@ -83,6 +83,9 @@ public class CallSuperProcess extends AbstractProcessor{
if(extendTree instanceof JCIdent){ if(extendTree instanceof JCIdent){
JCIdent tree = (JCIdent)extendTree; JCIdent tree = (JCIdent)extendTree;
if(tree == null || tree.sym == null) return super.visitClass(classTree, trees);
com.sun.tools.javac.code.Scope members = tree.sym.members(); com.sun.tools.javac.code.Scope members = tree.sym.members();
if(checkScope(members)) if(checkScope(members))

2
core/src/mindustry/ui/fragments/HudFragment.java
View File

@@ -718,7 +718,7 @@ public class HudFragment extends Fragment{
Draw.color(Pal.darkerGray); Draw.color(Pal.darkerGray);
Fill.poly(x + width/2f, y + height/2f, 6, height / Mathf.sqrt3); Fill.poly(x + width/2f, y + height/2f, 6, height / Mathf.sqrt3);
Draw.reset(); Draw.reset();
Drawf.shadow(x + width/2f, y + height/2f, height * 1.1f); Drawf.shadow(x + width/2f, y + height/2f, height * 1.13f);
} }
}, },
new Table(t -> { new Table(t -> {