Merge

2020-01-19 11:10:14 -05:00
parent f7c4ea3e58
commit c0844304a6
259 changed files with 7166 additions and 7198 deletions
--- a/core/src/mindustry/entities/effect/Lightning.java
+++ b/core/src/mindustry/entities/effect/Lightning.java
@@ -27,7 +27,7 @@ import static mindustry.Vars.*;
 public class Lightning extends TimedEntity implements DrawTrait, TimeTrait{
    public static final float lifetime = 10f;

-    private static final RandomXS128 random = new RandomXS128();
+    private static final Rand random = new Rand();
    private static final Rect rect = new Rect();
    private static final Array<Unit> entities = new Array<>();
    private static final IntSet hit = new IntSet();