Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/java/me/clip/placeholderapi/expansion/manager/CloudExpansionManager.java
This commit is contained in:
Sxtanna 2020-07-24 18:51:07 -04:00
commit 4e37f9f52a

View File

@ -204,7 +204,10 @@ public final class CloudExpansionManager
return;
}
this.cache.putAll(expansions);
for (final CloudExpansion expansion : expansions.values())
{
this.cache.put(toIndexName(expansion), expansion);
}
});
}