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

Fixed #6389

Browse Source
This commit is contained in:
Anuken
2021-11-29 20:13:59 -05:00
parent 22564de3c8
commit feba9d677e
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/mindustry/world/blocks/Attributes.java
View File

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

2
gradle.properties
View File

@@ -24,4 +24,4 @@ android.useAndroidX=true
#used for slow jitpack builds; TODO see if this actually works #used for slow jitpack builds; TODO see if this actually works
org.gradle.internal.http.socketTimeout=100000 org.gradle.internal.http.socketTimeout=100000
org.gradle.internal.http.connectionTimeout=100000 org.gradle.internal.http.connectionTimeout=100000
archash=e98a7f21 archash=00d1f312