diff --git a/Plugins/Mineplex.Core.Common/src/mineplex/core/common/Rank.java b/Plugins/Mineplex.Core.Common/src/mineplex/core/common/Rank.java index 32770cc1a..09ee3d266 100644 --- a/Plugins/Mineplex.Core.Common/src/mineplex/core/common/Rank.java +++ b/Plugins/Mineplex.Core.Common/src/mineplex/core/common/Rank.java @@ -14,14 +14,15 @@ public enum Rank SNR_MODERATOR("Sr.Mod", ChatColor.GOLD), MODERATOR("Mod", ChatColor.GOLD), HELPER("Helper", ChatColor.DARK_AQUA), - MAPDEV("Mapper", ChatColor.BLUE), - MAPLEAD("MapKing", ChatColor.DARK_PURPLE), + MAPDEV("MapTeam", ChatColor.BLUE), + MAPLEAD("MapLead", ChatColor.DARK_PURPLE), EVENT("Event", ChatColor.WHITE), //Staff ^^ YOUTUBE("YouTube", ChatColor.RED), + TWITCH("Twitch", ChatColor.DARK_PURPLE), LEGEND("Legend", ChatColor.GREEN), HERO("Hero", ChatColor.LIGHT_PURPLE), ULTRA("Ultra", ChatColor.AQUA), diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Mage/GlacialBlade.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Mage/GlacialBlade.java index 2c5cb4647..e08ad1c21 100644 --- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Mage/GlacialBlade.java +++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Mage/GlacialBlade.java @@ -27,8 +27,6 @@ import mineplex.minecraft.game.classcombat.Skill.SkillFactory; public class GlacialBlade extends SkillActive implements IThrown { - private float radius = 1.5f; - public GlacialBlade(SkillFactory skills, String name, ClassType classType, SkillType skillType, int cost, int levels, int energy, int energyMod, @@ -75,7 +73,7 @@ public class GlacialBlade extends SkillActive implements IThrown Item item = player.getWorld().dropItem(player.getEyeLocation().add(player.getLocation().getDirection()).subtract(0, 0.2, 0), ItemStackFactory.Instance.CreateStack(370)); UtilAction.velocity(item, player.getLocation().getDirection(), 1.6, false, 0, 0.2, 10, false); Factory.Projectile().AddThrow(item, player, this, -1, true, true, true, - null, 0, 0, ParticleType.SNOW_SHOVEL, UpdateType.TICK, radius); + null, 0, 0, ParticleType.SNOW_SHOVEL, UpdateType.TICK, 0.4f); //Effect item.getWorld().playSound(item.getLocation(), Sound.ORB_PICKUP, 1f, 2f); @@ -124,21 +122,4 @@ public class GlacialBlade extends SkillActive implements IThrown { } - - @EventHandler - public void radiusSet(PlayerCommandPreprocessEvent event) - { - if (event.getMessage().startsWith("/gbr ")) - { - try - { - radius = Float.parseFloat(event.getMessage().split(" ")[1]); - event.getPlayer().sendMessage("Radius: " + radius); - } - catch(Exception e) - { - event.getPlayer().sendMessage("Radius FAIL: " + radius); - } - } - } }