From 873d8782521c07c36e34cd66449c123b3f5d424a Mon Sep 17 00:00:00 2001 From: "main()" Date: Thu, 1 Mar 2012 16:55:37 +0100 Subject: [PATCH] Build fixed. Bukkit, I hate breaking changes! However, this is not tested *at all*. Try it if you're brave enough ^^ --- .../onarandombox/MultiverseCore/MVWorld.java | 21 ++++++++++++------- .../test/TestWorldProperties.java | 11 +++++----- 2 files changed, 19 insertions(+), 13 deletions(-) diff --git a/src/main/java/com/onarandombox/MultiverseCore/MVWorld.java b/src/main/java/com/onarandombox/MultiverseCore/MVWorld.java index 457beae5..3d376a39 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/MVWorld.java +++ b/src/main/java/com/onarandombox/MultiverseCore/MVWorld.java @@ -189,7 +189,9 @@ public class MVWorld implements MultiverseWorld { // Things I haven't converted yet. this.getMobExceptions(); - this.getWorldBlacklist().addAll(worldSection.getList("worldblacklist", new ArrayList())); + List tempWorldBlacklist = worldSection.getStringList("worldblacklist"); + if (tempWorldBlacklist != null) + this.getWorldBlacklist().addAll(tempWorldBlacklist); // Enable and do the save. this.canSave = true; @@ -334,16 +336,19 @@ public class MVWorld implements MultiverseWorld { // TODO: Migrate this method. private void getMobExceptions() { List temp; - temp = this.worldSection.getList("animals.exceptions", new ArrayList()); + temp = this.worldSection.getStringList("animals.exceptions"); // Add Animals to the exclusion list - - for (String s : temp) { - this.masterList.get("animals").add(s.toUpperCase()); + if (temp != null) { + for (String s : temp) { + this.masterList.get("animals").add(s.toUpperCase()); + } } - temp = this.worldSection.getList("monsters.exceptions", new ArrayList()); + temp = this.worldSection.getStringList("monsters.exceptions"); // Add Monsters to the exclusion list - for (String s : temp) { - this.masterList.get("monsters").add(s.toUpperCase()); + if (temp != null) { + for (String s : temp) { + this.masterList.get("monsters").add(s.toUpperCase()); + } } } diff --git a/src/test/java/com/onarandombox/MultiverseCore/test/TestWorldProperties.java b/src/test/java/com/onarandombox/MultiverseCore/test/TestWorldProperties.java index 72c3abfa..85264935 100644 --- a/src/test/java/com/onarandombox/MultiverseCore/test/TestWorldProperties.java +++ b/src/test/java/com/onarandombox/MultiverseCore/test/TestWorldProperties.java @@ -21,6 +21,7 @@ import org.bukkit.World; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; import org.bukkit.entity.Entity; +import org.bukkit.entity.HumanEntity; import org.bukkit.entity.Player; import org.bukkit.event.entity.EntityRegainHealthEvent; import org.bukkit.event.entity.EntityRegainHealthEvent.RegainReason; @@ -71,7 +72,7 @@ public class TestWorldProperties { private PlayerJoinEvent playerJoinEvent; private PlayerRespawnEvent playerRespawnBed; private PlayerRespawnEvent playerRespawnNormal; - private Entity mockEntity; + private HumanEntity mockHumanEntity; private EntityRegainHealthEvent entityRegainHealthEvent; private FoodLevelChangeEvent entityFoodLevelChangeEvent; private FoodLevelChangeEvent entityFoodLevelRiseEvent; @@ -327,17 +328,17 @@ public class TestWorldProperties { when(playerRespawnNormal.getPlayer()).thenReturn(mockPlayer); when(playerRespawnNormal.isBedSpawn()).thenReturn(false); //// Entity events - mockEntity = mock(Entity.class); + mockHumanEntity = mock(HumanEntity.class); // entity regain health entityRegainHealthEvent = PowerMockito.mock(EntityRegainHealthEvent.class); when(entityRegainHealthEvent.getRegainReason()).thenReturn(RegainReason.REGEN); - when(mockEntity.getLocation()).thenReturn(new Location(mvWorld.getCBWorld(), 0, 0, 0)); - when(entityRegainHealthEvent.getEntity()).thenReturn(mockEntity); + when(mockHumanEntity.getLocation()).thenReturn(new Location(mvWorld.getCBWorld(), 0, 0, 0)); + when(entityRegainHealthEvent.getEntity()).thenReturn(mockHumanEntity); // entity food level change event entityFoodLevelChangeEvent = PowerMockito.mock(FoodLevelChangeEvent.class); // this won't do anything since we're not mocking a player, // but the plugin should be able to handle this! - when(entityFoodLevelChangeEvent.getEntity()).thenReturn(mockEntity); + when(entityFoodLevelChangeEvent.getEntity()).thenReturn(mockHumanEntity); entityFoodLevelRiseEvent = PowerMockito.mock(FoodLevelChangeEvent.class); when(mockPlayer.getFoodLevel()).thenReturn(2); when(entityFoodLevelRiseEvent.getEntity()).thenReturn(mockPlayer);