Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex

This commit is contained in:
libraryaddict 2015-03-20 17:35:42 +13:00
commit 6e30834565
2 changed files with 2 additions and 3 deletions

View File

@ -13,7 +13,7 @@ public class StopCommand extends CommandBase<ArcadeManager>
{
public StopCommand(ArcadeManager plugin)
{
super(plugin, Rank.ADMIN, "stop");
super(plugin, Rank.ADMIN, new Rank[] {Rank.MAPLEAD}, "stop");
}
@Override

View File

@ -111,7 +111,6 @@ public class PerkWolfPet extends Perk
if (_name)
{
wolf.setCustomName(cur.getName() + "'s Wolf");
wolf.setCustomNameVisible(true);
}
@ -351,7 +350,7 @@ public class PerkWolfPet extends Perk
if (!IsMinion(event.GetDamagerEntity(true)))
return;
double damage = 4;
double damage = 3;
event.AddMod("Wolf Minion", "Negate", -event.GetDamageInitial(), false);
event.AddMod("Wolf Minion", "Damage", damage, false);