diff --git a/annotations/src/main/java/mindustry/annotations/impl/CallSuperProcess.java b/annotations/src/main/java/mindustry/annotations/impl/CallSuperProcess.java index b43a2d3eef..e28ecf13a0 100644 --- a/annotations/src/main/java/mindustry/annotations/impl/CallSuperProcess.java +++ b/annotations/src/main/java/mindustry/annotations/impl/CallSuperProcess.java @@ -68,9 +68,9 @@ public class CallSuperProcess extends AbstractProcessor{ } static class CodeAnalyzerTreeScanner extends TreePathScanner{ - private String methodName; - private MethodTree method; - private boolean callSuperUsed; + String methodName; + MethodTree method; + boolean callSuperUsed; @Override public Object visitClass(ClassTree classTree, Trees trees){ @@ -83,6 +83,9 @@ public class CallSuperProcess extends AbstractProcessor{ if(extendTree instanceof JCIdent){ 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(); if(checkScope(members)) diff --git a/core/src/mindustry/ui/fragments/HudFragment.java b/core/src/mindustry/ui/fragments/HudFragment.java index af593d0078..84df2d3b9a 100644 --- a/core/src/mindustry/ui/fragments/HudFragment.java +++ b/core/src/mindustry/ui/fragments/HudFragment.java @@ -718,7 +718,7 @@ public class HudFragment extends Fragment{ Draw.color(Pal.darkerGray); Fill.poly(x + width/2f, y + height/2f, 6, height / Mathf.sqrt3); 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 -> {