From 5868ad64b4d817f7e9216b34f9ee6aa17969994b Mon Sep 17 00:00:00 2001 From: Kisaragi Date: Fri, 31 Dec 2021 00:46:21 +0900 Subject: [PATCH] use Collections' factory method instead of static field this resolves some unchecked generics warning --- .../com/onarandombox/MultiverseCore/MVWorld.java | 2 +- .../onarandombox/MultiverseCore/MultiverseCore.java | 2 +- .../MultiverseCore/TestEntitySpawnRules.java | 12 ++++++------ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/onarandombox/MultiverseCore/MVWorld.java b/src/main/java/com/onarandombox/MultiverseCore/MVWorld.java index d7367ad2..af9f6611 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/MVWorld.java +++ b/src/main/java/com/onarandombox/MultiverseCore/MVWorld.java @@ -356,7 +356,7 @@ public class MVWorld implements MultiverseWorld { @Override public Map serialize() { - return Collections.EMPTY_MAP; + return Collections.emptyMap(); } /** diff --git a/src/main/java/com/onarandombox/MultiverseCore/MultiverseCore.java b/src/main/java/com/onarandombox/MultiverseCore/MultiverseCore.java index bc39f40e..6fda9ae9 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/MultiverseCore.java +++ b/src/main/java/com/onarandombox/MultiverseCore/MultiverseCore.java @@ -534,7 +534,7 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core { } else if (entry.getValue() instanceof ConfigurationSection) { Logging.fine("Migrating: " + entry.getKey()); // we have to migrate this - WorldProperties world = new WorldProperties(Collections.EMPTY_MAP); + WorldProperties world = new WorldProperties(Collections.emptyMap()); ConfigurationSection section = (ConfigurationSection) entry.getValue(); // migrate animals and monsters diff --git a/src/test/java/com/onarandombox/MultiverseCore/TestEntitySpawnRules.java b/src/test/java/com/onarandombox/MultiverseCore/TestEntitySpawnRules.java index f45c3e01..d76c57b3 100644 --- a/src/test/java/com/onarandombox/MultiverseCore/TestEntitySpawnRules.java +++ b/src/test/java/com/onarandombox/MultiverseCore/TestEntitySpawnRules.java @@ -101,42 +101,42 @@ public class TestEntitySpawnRules { @Test public void test() { // test 1: no spawning at all allowed - adjustSettings(false, false, Collections.EMPTY_LIST, Collections.EMPTY_LIST); + adjustSettings(false, false, Collections.emptyList(), Collections.emptyList()); createAnimals(); spawnAllNatural(); verify(sheepEvent).setCancelled(true); verify(zombieEvent).setCancelled(true); // test 2: only monsters - adjustSettings(false, true, Collections.EMPTY_LIST, Collections.EMPTY_LIST); + adjustSettings(false, true, Collections.emptyList(), Collections.emptyList()); createAnimals(); spawnAllNatural(); verify(sheepEvent).setCancelled(true); verify(zombieEvent).setCancelled(false); // test 3: all spawning allowed - adjustSettings(true, true, Collections.EMPTY_LIST, Collections.EMPTY_LIST); + adjustSettings(true, true, Collections.emptyList(), Collections.emptyList()); createAnimals(); spawnAllNatural(); verify(sheepEvent).setCancelled(false); verify(zombieEvent).setCancelled(false); // test 4: no spawning with zombie exception - adjustSettings(false, false, Collections.EMPTY_LIST, Arrays.asList("ZOMBIE")); + adjustSettings(false, false, Collections.emptyList(), Arrays.asList("ZOMBIE")); createAnimals(); spawnAllNatural(); verify(sheepEvent).setCancelled(true); verify(zombieEvent).setCancelled(false); // test 5: all spawning with sheep exception - adjustSettings(true, true, Arrays.asList("SHEEP"), Collections.EMPTY_LIST); + adjustSettings(true, true, Arrays.asList("SHEEP"), Collections.emptyList()); createAnimals(); spawnAllNatural(); verify(sheepEvent).setCancelled(true); verify(zombieEvent).setCancelled(false); // test 6: eggs - adjustSettings(false, false, Collections.EMPTY_LIST, Collections.EMPTY_LIST); + adjustSettings(false, false, Collections.emptyList(), Collections.emptyList()); createAnimals(); spawnAll(SpawnReason.SPAWNER_EGG); verify(sheepEvent, never()).setCancelled(anyBoolean());