JarvisBigBalls/Mineplex2018-withcommit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added Twitch Rank

Browse Source 
fixes hitbox on glacial
This commit is contained in:
Cheese 2015-04-10 13:11:02 +10:00
parent c3798834c3
commit 85c9f9010e
2 changed files with 4 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Plugins/Mineplex.Core.Common/src/mineplex/core/common/Rank.java
View File

@ -14,14 +14,15 @@ public enum Rank
SNR_MODERATOR("Sr.Mod", ChatColor.GOLD), SNR_MODERATOR("Sr.Mod", ChatColor.GOLD),
MODERATOR("Mod", ChatColor.GOLD), MODERATOR("Mod", ChatColor.GOLD),
HELPER("Helper", ChatColor.DARK_AQUA), HELPER("Helper", ChatColor.DARK_AQUA),
MAPDEV("Mapper", ChatColor.BLUE), MAPDEV("MapTeam", ChatColor.BLUE),
MAPLEAD("MapKing", ChatColor.DARK_PURPLE), MAPLEAD("MapLead", ChatColor.DARK_PURPLE),
EVENT("Event", ChatColor.WHITE), EVENT("Event", ChatColor.WHITE),
//Staff ^^ //Staff ^^
YOUTUBE("YouTube", ChatColor.RED), YOUTUBE("YouTube", ChatColor.RED),
TWITCH("Twitch", ChatColor.DARK_PURPLE),
LEGEND("Legend", ChatColor.GREEN), LEGEND("Legend", ChatColor.GREEN),
HERO("Hero", ChatColor.LIGHT_PURPLE), HERO("Hero", ChatColor.LIGHT_PURPLE),
ULTRA("Ultra", ChatColor.AQUA), ULTRA("Ultra", ChatColor.AQUA),

21
Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Mage/GlacialBlade.java
View File

@ -27,8 +27,6 @@ import mineplex.minecraft.game.classcombat.Skill.SkillFactory;
public class GlacialBlade extends SkillActive implements IThrown public class GlacialBlade extends SkillActive implements IThrown
{ {
private float radius = 1.5f;
public GlacialBlade(SkillFactory skills, String name, ClassType classType, SkillType skillType, public GlacialBlade(SkillFactory skills, String name, ClassType classType, SkillType skillType,
int cost, int levels, int cost, int levels,
int energy, int energyMod, 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)); 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); UtilAction.velocity(item, player.getLocation().getDirection(), 1.6, false, 0, 0.2, 10, false);
Factory.Projectile().AddThrow(item, player, this, -1, true, true, true, 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 //Effect
item.getWorld().playSound(item.getLocation(), Sound.ORB_PICKUP, 1f, 2f); 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);
}
}
}
} }