From 393c21d2e8eb3d6a8ac78a2a9172eba0f48ddc02 Mon Sep 17 00:00:00 2001 From: SamB440 Date: Mon, 10 Feb 2020 14:54:52 +0000 Subject: [PATCH] Fix constructors --- .../commands/RPGRegionsCommand.java | 3 ++- .../managers/RPGRegionsManagers.java | 19 +++++++++++++++++-- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/rpgregions/src/main/java/net/islandearth/rpgregions/commands/RPGRegionsCommand.java b/rpgregions/src/main/java/net/islandearth/rpgregions/commands/RPGRegionsCommand.java index eb4886e..4e2ee75 100644 --- a/rpgregions/src/main/java/net/islandearth/rpgregions/commands/RPGRegionsCommand.java +++ b/rpgregions/src/main/java/net/islandearth/rpgregions/commands/RPGRegionsCommand.java @@ -60,7 +60,8 @@ public class RPGRegionsCommand extends BaseCommand { int x = player.getLocation().getBlockX(); int y = player.getLocation().getBlockY(); int z = player.getLocation().getBlockZ(); - ConfiguredRegion configuredRegion = new ConfiguredRegion(player.getWorld(), region, region, new ArrayList<>(), x, y, z); + ConfiguredRegion configuredRegion = new ConfiguredRegion(player.getWorld(), region, region, new ArrayList<>(), + new ArrayList<>(), x, y, z); plugin.getManagers().getRegionsCache().addConfiguredRegion(configuredRegion); player.sendMessage(StringUtils.colour("&aAdded configured region " + region + "!")); //TODO add an editor diff --git a/rpgregions/src/main/java/net/islandearth/rpgregions/managers/RPGRegionsManagers.java b/rpgregions/src/main/java/net/islandearth/rpgregions/managers/RPGRegionsManagers.java index acb5ba9..f2104c7 100644 --- a/rpgregions/src/main/java/net/islandearth/rpgregions/managers/RPGRegionsManagers.java +++ b/rpgregions/src/main/java/net/islandearth/rpgregions/managers/RPGRegionsManagers.java @@ -4,21 +4,32 @@ import net.islandearth.rpgregions.RPGRegions; import net.islandearth.rpgregions.api.integrations.IntegrationManager; import net.islandearth.rpgregions.api.integrations.IntegrationType; import net.islandearth.rpgregions.api.integrations.hooks.PlaceholderRegionHook; +import net.islandearth.rpgregions.effects.PotionRegionEffect; +import net.islandearth.rpgregions.effects.RegionEffect; import net.islandearth.rpgregions.managers.data.RPGRegionsCache; import net.islandearth.rpgregions.managers.data.StorageManager; import net.islandearth.rpgregions.managers.data.StorageType; import net.islandearth.rpgregions.managers.data.region.ConfiguredRegion; -import net.islandearth.rpgregions.rewards.*; +import net.islandearth.rpgregions.rewards.ConsoleCommandReward; +import net.islandearth.rpgregions.rewards.DiscoveryReward; +import net.islandearth.rpgregions.rewards.ExperienceReward; +import net.islandearth.rpgregions.rewards.ItemReward; +import net.islandearth.rpgregions.rewards.PlayerCommandReward; +import net.islandearth.rpgregions.utils.ItemStackBuilder; import net.islandearth.rpgregions.utils.XMaterial; import net.islandearth.rpgregions.utils.XSound; import org.bukkit.Bukkit; +import org.bukkit.Material; import org.bukkit.inventory.ItemStack; +import org.bukkit.potion.PotionEffect; +import org.bukkit.potion.PotionEffectType; import java.io.File; import java.io.FileReader; import java.io.IOException; import java.io.Reader; import java.util.ArrayList; +import java.util.Collections; import java.util.List; import java.util.logging.Level; @@ -53,7 +64,11 @@ public class RPGRegionsManagers { rewards.add(new ItemReward(new ItemStack(XMaterial.IRON_BARS.parseMaterial()))); rewards.add(new PlayerCommandReward("say I discovered a region!")); rewards.add(new ConsoleCommandReward("say Server sees you discovered a region!")); - ConfiguredRegion configuredRegion = new ConfiguredRegion(null, "exampleconfig", "ExampleConfig", rewards, + List effects = new ArrayList<>(); + effects.add(new PotionRegionEffect( + new PotionEffect(PotionEffectType.GLOWING, 100, 1, true, true, true), + Collections.singletonList(new ItemStackBuilder(Material.IRON_CHESTPLATE).build()))); + ConfiguredRegion configuredRegion = new ConfiguredRegion(null, "exampleconfig", "ExampleConfig", rewards, effects, XSound.AMBIENT_UNDERWATER_EXIT.parseSound(), XMaterial.WOODEN_AXE.parseMaterial(), 0,