Upstream/Essentials
1
0
Fork 0
mirror of https://github.com/EssentialsX/Essentials.git synced 2025-03-02 11:11:58 +01:00
Code Issues Projects Releases Wiki Activity

[Fix] Stacked mobs count towards spawnmob-limit count.

Browse Source
This commit is contained in:
KHobbits 2013-04-30 01:03:37 +01:00
parent 7913cfdb3c
commit 9d2358ed4d
1 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -82,10 +82,10 @@ public class SpawnMob
{ {
throw new Exception(_("unableToSpawnMob")); throw new Exception(_("unableToSpawnMob"));
} }
if (parts.size() > 1 && !user.isAuthorized("essentials.spawnmob.stack")) if (parts.size() > 1 && !user.isAuthorized("essentials.spawnmob.stack"))
{ {
throw new Exception(_("cannotStackMob")); throw new Exception(_("cannotStackMob"));
} }
spawnmob(ess, server, user, user, block.getLocation(), parts, data, mobCount); spawnmob(ess, server, user, user, block.getLocation(), parts, data, mobCount);
} }
@ -106,16 +106,27 @@ public class SpawnMob
{ {
final Location sloc = Util.getSafeDestination(loc); final Location sloc = Util.getSafeDestination(loc);
for(int i = 0; i < parts.size(); i++) for (int i = 0; i < parts.size(); i++)
{ {
Mob mob = Mob.fromName(parts.get(i)); Mob mob = Mob.fromName(parts.get(i));
checkSpawnable(ess, sender, mob); checkSpawnable(ess, sender, mob);
} }
int serverLimit = ess.getSettings().getSpawnMobLimit(); final int serverLimit = ess.getSettings().getSpawnMobLimit();
if (mobCount > serverLimit) int effectiveLimit = serverLimit / parts.size();
if (effectiveLimit < 1)
{ {
mobCount = serverLimit; effectiveLimit = 1;
while (parts.size() > serverLimit)
{
parts.remove(serverLimit);
}
}
if (mobCount > effectiveLimit)
{
mobCount = effectiveLimit;
sender.sendMessage(_("mobSpawnLimit")); sender.sendMessage(_("mobSpawnLimit"));
} }
@ -126,7 +137,7 @@ public class SpawnMob
{ {
spawnMob(ess, server, sender, target, sloc, parts, data); spawnMob(ess, server, sender, target, sloc, parts, data);
} }
sender.sendMessage(mobCount + " " + mob.name.toLowerCase(Locale.ENGLISH) + mob.suffix + " " + _("spawned")); sender.sendMessage(mobCount * parts.size() + " " + mob.name.toLowerCase(Locale.ENGLISH) + mob.suffix + " " + _("spawned"));
} }
catch (MobException e1) catch (MobException e1)
{ {
@ -160,7 +171,7 @@ public class SpawnMob
changeMobData(mob.getType(), spawnedMob, data.get(i), target); changeMobData(mob.getType(), spawnedMob, data.get(i), target);
} }
} }
int next = (i + 1); int next = (i + 1);
if (next < parts.size()) //If it's the last mob in the list, don't set the mount if (next < parts.size()) //If it's the last mob in the list, don't set the mount
{ {