Bug fixing
This commit is contained in:
parent
1a48b8aa81
commit
b42041c2cf
|
@ -100,7 +100,7 @@ public class Level extends Addon implements Listener {
|
|||
@EventHandler
|
||||
public void onBentoBoxReady(BentoBoxReadyEvent e) {
|
||||
// Perform upgrade check
|
||||
manager.migrate(this);
|
||||
manager.migrate();
|
||||
// Load TopTens
|
||||
manager.loadTopTens();
|
||||
/*
|
||||
|
|
|
@ -87,7 +87,7 @@ public class LevelsManager {
|
|||
background = new PanelItemBuilder().icon(Material.BLACK_STAINED_GLASS_PANE).name(" ").build();
|
||||
}
|
||||
|
||||
public void migrate(Level addon2) {
|
||||
public void migrate() {
|
||||
Database<LevelsData> oldDb = new Database<>(addon, LevelsData.class);
|
||||
oldDb.loadObjects().forEach(ld -> {
|
||||
try {
|
||||
|
@ -323,9 +323,7 @@ public class LevelsManager {
|
|||
* @return initial level of island
|
||||
*/
|
||||
public long getInitialLevel(Island island) {
|
||||
@Nullable
|
||||
IslandLevels ld = getLevelsData(island);
|
||||
return ld == null ? 0 : ld.getInitialLevel();
|
||||
return getLevelsData(island).getInitialLevel();
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
package world.bentobox.level.objects;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.EnumMap;
|
||||
import java.util.Map;
|
||||
|
||||
import org.bukkit.Material;
|
||||
|
@ -60,8 +60,8 @@ public class IslandLevels implements DataObject {
|
|||
*/
|
||||
public IslandLevels(String islandUUID) {
|
||||
uniqueId = islandUUID;
|
||||
uwCount = new HashMap<>();
|
||||
mdCount = new HashMap<>();
|
||||
uwCount = new EnumMap<>(Material.class);
|
||||
mdCount = new EnumMap<>(Material.class);
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -151,6 +151,4 @@ public class IslandLevels implements DataObject {
|
|||
}
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
|
|
@ -225,7 +225,7 @@ public class LevelsManagerTest {
|
|||
when(iwm.getPermissionPrefix(any())).thenReturn("bskyblock.");
|
||||
|
||||
lm = new LevelsManager(addon);
|
||||
lm.migrate(addon);
|
||||
lm.migrate();
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
Loading…
Reference in New Issue