Merge remote-tracking branch 'refs/remotes/yugecin/master'

This commit is contained in:
Awlex 2016-11-19 21:55:05 +01:00
commit 5366b53db0

View File

@ -184,6 +184,8 @@ public class SBOverlay {
public void setGameObjects(GameObject[] gameObjects) { public void setGameObjects(GameObject[] gameObjects) {
if (this.gameObjects.length != gameObjects.length) { if (this.gameObjects.length != gameObjects.length) {
optionsMap = new HashMap[gameObjects.length]; optionsMap = new HashMap[gameObjects.length];
}
if (optionsMap.length > 0) {
// copy all current settings in first obj map // copy all current settings in first obj map
optionsMap[0] = new HashMap<>(); optionsMap[0] = new HashMap<>();
for (Options.GameOption o : options.getSavedOptionList()) { for (Options.GameOption o : options.getSavedOptionList()) {