From 0c418d1a0925015d41be4c1dd444bbc4c863d298 Mon Sep 17 00:00:00 2001 From: Anuken Date: Thu, 29 Oct 2020 11:51:17 -0400 Subject: [PATCH] Libs --- core/src/mindustry/game/Teams.java | 3 ++- gradle.properties | 2 +- ios/robovm.xml | 2 ++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/core/src/mindustry/game/Teams.java b/core/src/mindustry/game/Teams.java index a745d40029..f8968b95e7 100644 --- a/core/src/mindustry/game/Teams.java +++ b/core/src/mindustry/game/Teams.java @@ -261,11 +261,12 @@ public class Teams{ } public void updateCount(UnitType type, int amount){ + if(type == null) return; unitCount = Math.max(amount + unitCount, 0); if(typeCounts == null || typeCounts.length <= type.id){ typeCounts = new int[Vars.content.units().size]; } - typeCounts[type.id] = Math.max(amount + typeCounts [type.id], 0); + typeCounts[type.id] = Math.max(amount + typeCounts[type.id], 0); } public QuadTree tree(){ diff --git a/gradle.properties b/gradle.properties index 07a76d45aa..5ce1e856d4 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,3 @@ org.gradle.daemon=true org.gradle.jvmargs=-Xms256m -Xmx1024m -archash=ddc3e52e7c4f534a22f4f69be22a7c32a9589784 +archash=d4381c1fed03df6e69a6d99c75c723409c19f904 diff --git a/ios/robovm.xml b/ios/robovm.xml index cc970c87a4..d78a3e3c97 100644 --- a/ios/robovm.xml +++ b/ios/robovm.xml @@ -37,6 +37,8 @@ z + arc + arc-freetype UIKit