Merge

core/src/mindustry/game/GlobalData.java

@@ -85,9 +85,15 @@ public class GlobalData{
         if(amount > 0){
             unlockContent(item);
         }
+        amount = Math.max(amount, 0);
+
         modified = true;
         items.getAndIncrement(item, 0, amount);
         state.stats.itemsDelivered.getAndIncrement(item, 0, amount);
+
+        //clamp overflow
+        if(items.get(item, 0) < 0) items.put(item, Integer.MAX_VALUE);
+        if(state.stats.itemsDelivered.get(item, 0) < 0) state.stats.itemsDelivered.put(item, Integer.MAX_VALUE);
     }
 
     public boolean hasItems(Array<ItemStack> stacks){

core/src/mindustry/game/Team.java

@@ -35,7 +35,7 @@ public class Team implements Comparable<Team>{
         for(int i = 6; i < all.length; i++){
             new Team(i, "team#" + i, Color.HSVtoRGB(360f * Mathf.random(), 100f * Mathf.random(0.6f, 1f), 100f * Mathf.random(0.8f, 1f), 1f));
         }
-        Mathf.random.setSeed(new RandomXS128().nextLong());
+        Mathf.random.setSeed(new Rand().nextLong());
     }
 
     public static Team get(int id){