Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features

Conflicts: core/src/mindustry/ai/BlockIndexer.java gradle.properties
2021-12-07 14:09:03 -05:00
parent 600954bf4b 76af0228c1
commit f5e9df1265
8 changed files with 49 additions and 11 deletions
--- a/core/src/mindustry/world/blocks/Attributes.java
+++ b/core/src/mindustry/world/blocks/Attributes.java
@@ -25,6 +25,7 @@ public class Attributes implements JsonSerializable{

    public void add(Attributes other){
        check();
+        other.check();
        for(int i = 0; i < arr.length; i++){
            arr[i] += other.arr[i];
        }
@@ -32,6 +33,7 @@ public class Attributes implements JsonSerializable{

    public void add(Attributes other, float scl){
        check();
+        other.check();
        for(int i = 0; i < arr.length; i++){
            arr[i] += other.arr[i] * scl;
        }