minecraft/Essentials
1
0
Fork 0
mirror of https://github.com/essentials/Essentials.git synced 2025-08-19 04:52:30 +02:00
Code Issues Releases Wiki Activity

Move spawnmob.stack perm check to the right place.

Browse Source
This commit is contained in:
KHobbits
2013-04-30 01:37:39 +01:00
parent 9d2358ed4d
commit a43cbe061a
2 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Essentials/src/com/earth2me/essentials/SpawnMob.java
View File

@@ -82,10 +82,6 @@ public class SpawnMob
{ {
throw new Exception(_("unableToSpawnMob")); throw new Exception(_("unableToSpawnMob"));
} }
if (parts.size() > 1 && !user.isAuthorized("essentials.spawnmob.stack"))
{
throw new Exception(_("cannotStackMob"));
}
spawnmob(ess, server, user, user, block.getLocation(), parts, data, mobCount); spawnmob(ess, server, user, user, block.getLocation(), parts, data, mobCount);
} }

17
Essentials/src/com/earth2me/essentials/commands/Commandspawnmob.java
View File

@@ -16,7 +16,7 @@ public class Commandspawnmob extends EssentialsCommand
{ {
super("spawnmob"); super("spawnmob");
} }
@Override @Override
public void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception public void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception
{ {
@@ -34,17 +34,22 @@ public class Commandspawnmob extends EssentialsCommand
{ {
mobCount = Integer.parseInt(args[1]); mobCount = Integer.parseInt(args[1]);
} }
if (mobParts.size() > 1 && !user.isAuthorized("essentials.spawnmob.stack"))
{
throw new Exception(_("cannotStackMob"));
}
if (args.length >= 3) if (args.length >= 3)
{ {
final User target = getPlayer(ess.getServer(), user, args, 2); final User target = getPlayer(ess.getServer(), user, args, 2);
SpawnMob.spawnmob(ess, server, user, target, mobParts, mobData, mobCount); SpawnMob.spawnmob(ess, server, user, target, mobParts, mobData, mobCount);
return; return;
} }
SpawnMob.spawnmob(ess, server, user, mobParts, mobData, mobCount); SpawnMob.spawnmob(ess, server, user, mobParts, mobData, mobCount);
} }
@Override @Override
public void run(final Server server, final CommandSender sender, final String commandLabel, final String[] args) throws Exception public void run(final Server server, final CommandSender sender, final String commandLabel, final String[] args) throws Exception
{ {
@@ -53,11 +58,11 @@ public class Commandspawnmob extends EssentialsCommand
final String mobList = Util.joinList(Mob.getMobList()); final String mobList = Util.joinList(Mob.getMobList());
throw new NotEnoughArgumentsException(_("mobsAvailable", mobList)); throw new NotEnoughArgumentsException(_("mobsAvailable", mobList));
} }
List<String> mobParts = SpawnMob.mobParts(args[0]); List<String> mobParts = SpawnMob.mobParts(args[0]);
List<String> mobData = SpawnMob.mobData(args[0]); List<String> mobData = SpawnMob.mobData(args[0]);
int mobCount = Integer.parseInt(args[1]); int mobCount = Integer.parseInt(args[1]);
final User target = getPlayer(ess.getServer(), args, 2, true, false); final User target = getPlayer(ess.getServer(), args, 2, true, false);
SpawnMob.spawnmob(ess, server, sender, target, mobParts, mobData, mobCount); SpawnMob.spawnmob(ess, server, sender, target, mobParts, mobData, mobCount);
} }