minecraft/Essentials
1
0
Fork 0
mirror of https://github.com/essentials/Essentials.git synced 2025-08-17 12:01:20 +02:00
Code Issues Releases Wiki Activity

Merge pull request #433 from GunfighterJ/master

Browse Source 
More tab fixes
This commit is contained in:
Iaccidentally
2013-04-01 14:23:06 -07:00
parent cd50ee2732 e78db0963c
commit 4131a36765
3 changed files with 101 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

196
Essentials/src/net/ess3/SpawnMob.java
View File

@@ -48,41 +48,41 @@ public class SpawnMob
return Util.joinList(availableList); return Util.joinList(availableList);
} }
public static List<String> mobParts(final String mobString) public static List<String> mobParts(final String mobString)
{ {
String[] mobParts = comma.split(mobString); String[] mobParts = comma.split(mobString);
List<String> mobs = new ArrayList<String>(); List<String> mobs = new ArrayList<String>();
for (String mobPart : mobParts) for (String mobPart : mobParts)
{ {
String[] mobDatas = colon.split(mobPart); String[] mobDatas = colon.split(mobPart);
mobs.add(mobDatas[0]); mobs.add(mobDatas[0]);
} }
return mobs; return mobs;
} }
public static List<String> mobData(final String mobString) public static List<String> mobData(final String mobString)
{ {
String[] mobParts = comma.split(mobString); String[] mobParts = comma.split(mobString);
List<String> mobData = new ArrayList<String>(); List<String> mobData = new ArrayList<String>();
for (String mobPart : mobParts) for (String mobPart : mobParts)
{ {
String[] mobDatas = colon.split(mobPart); String[] mobDatas = colon.split(mobPart);
if(mobDatas.length == 1) if (mobDatas.length == 1)
{ {
mobData.add(null); mobData.add(null);
} }
else else
{ {
mobData.add(mobDatas[1]); mobData.add(mobDatas[1]);
} }
} }
return mobData; return mobData;
} }
// This method spawns a mob where the user is looking, owned by user // This method spawns a mob where the user is looking, owned by user
public static void spawnmob(final IEssentials ess, final Server server, final IUser user, final List<String> parts, final List<String> data, int mobCount) throws Exception public static void spawnmob(final IEssentials ess, final Server server, final IUser user, final List<String> parts, final List<String> data, int mobCount) throws Exception
@@ -112,11 +112,11 @@ public class SpawnMob
{ {
final Location sloc = LocationUtil.getSafeDestination(loc); final Location sloc = LocationUtil.getSafeDestination(loc);
for (int i = 0; i < parts.size(); i++) for (int i = 0; i < parts.size(); i++)
{ {
EntityType mob = LivingEntities.fromName(parts.get(i)); EntityType mob = LivingEntities.fromName(parts.get(i));
checkSpawnable(ess, sender, mob); checkSpawnable(ess, sender, mob);
} }
ISettings settings = ess.getSettings(); ISettings settings = ess.getSettings();
int serverLimit = settings.getData().getCommands().getSpawnmob().getLimit(); int serverLimit = settings.getData().getCommands().getSpawnmob().getLimit();
@@ -127,7 +127,7 @@ public class SpawnMob
sender.sendMessage(_("mobSpawnLimit")); sender.sendMessage(_("mobSpawnLimit"));
} }
EntityType mob = LivingEntities.fromName(parts.get(0)); EntityType mob = LivingEntities.fromName(parts.get(0));
try try
{ {
for (int i = 0; i < mobCount; i++) for (int i = 0; i < mobCount; i++)
@@ -152,40 +152,40 @@ public class SpawnMob
private static void spawnMob(final IEssentials ess, final Server server, final CommandSender sender, final IUser target, final Location sloc, final List<String> parts, final List<String> data) throws Exception private static void spawnMob(final IEssentials ess, final Server server, final CommandSender sender, final IUser target, final Location sloc, final List<String> parts, final List<String> data) throws Exception
{ {
EntityType mob; EntityType mob;
Entity spawnedMob = null; Entity spawnedMob = null;
Entity spawnedMount; Entity spawnedMount;
final World spawningWorld = sloc.getWorld(); final World spawningWorld = sloc.getWorld();
for (int i = 0; i < parts.size(); i++) for (int i = 0; i < parts.size(); i++)
{ {
if (i == 0) if (i == 0)
{ {
mob = EntityType.fromName(parts.get(i)); mob = EntityType.fromName(parts.get(i));
spawnedMob = spawningWorld.spawn(sloc, (Class<? extends LivingEntity>)mob.getEntityClass()); spawnedMob = spawningWorld.spawn(sloc, (Class<? extends LivingEntity>) mob.getEntityClass());
if (data.get(i) != null) if (data.get(i) != null)
{ {
changeMobData(mob, spawnedMob, data.get(i), target); changeMobData(mob, spawnedMob, data.get(i), target);
} }
} }
int next = (i + 1); int next = (i + 1);
if (next < parts.size()) if (next < parts.size())
{ {
EntityType mMob = EntityType.fromName(parts.get(next)); EntityType mMob = EntityType.fromName(parts.get(next));
spawnedMount = spawningWorld.spawn(sloc, (Class<? extends LivingEntity>)mMob.getEntityClass()); spawnedMount = spawningWorld.spawn(sloc, (Class<? extends LivingEntity>) mMob.getEntityClass());
if(data.get(next) != null) if (data.get(next) != null)
{ {
changeMobData(mMob, spawnedMount, data.get(next), target); changeMobData(mMob, spawnedMount, data.get(next), target);
} }
spawnedMob.setPassenger(spawnedMount); spawnedMob.setPassenger(spawnedMount);
spawnedMob = spawnedMount; spawnedMob = spawnedMount;
} }
} }
} }
private static void checkSpawnable(IEssentials ess, CommandSender sender, EntityType mob) throws Exception private static void checkSpawnable(IEssentials ess, CommandSender sender, EntityType mob) throws Exception
@@ -195,7 +195,7 @@ public class SpawnMob
throw new Exception(_("invalidMob")); throw new Exception(_("invalidMob"));
} }
if (!Permissions.SPAWNMOB.isAuthorized((User)sender, mob.getName())) if (!Permissions.SPAWNMOB.isAuthorized((User) sender, mob.getName()))
{ {
throw new Exception(_("noPermToSpawnMob")); throw new Exception(_("noPermToSpawnMob"));
} }
@@ -209,7 +209,7 @@ public class SpawnMob
{ {
try try
{ {
((Slime)spawned).setSize(Integer.parseInt(data)); ((Slime) spawned).setSize(Integer.parseInt(data));
} }
catch (Exception e) catch (Exception e)
{ {
@@ -218,7 +218,7 @@ public class SpawnMob
} }
if (spawned instanceof Ageable && data.contains("baby")) if (spawned instanceof Ageable && data.contains("baby"))
{ {
((Ageable)spawned).setBaby(); ((Ageable) spawned).setBaby();
data = data.replace("baby", ""); data = data.replace("baby", "");
} }
if (spawned instanceof Colorable) if (spawned instanceof Colorable)
@@ -229,11 +229,11 @@ public class SpawnMob
if (color.equals("RANDOM")) if (color.equals("RANDOM"))
{ {
final Random rand = new Random(); final Random rand = new Random();
((Colorable)spawned).setColor(DyeColor.values()[rand.nextInt(DyeColor.values().length)]); ((Colorable) spawned).setColor(DyeColor.values()[rand.nextInt(DyeColor.values().length)]);
} }
else else
{ {
((Colorable)spawned).setColor(DyeColor.valueOf(color)); ((Colorable) spawned).setColor(DyeColor.valueOf(color));
} }
} }
catch (Exception e) catch (Exception e)
@@ -243,32 +243,32 @@ public class SpawnMob
} }
if (spawned instanceof Tameable && data.contains("tamed") && target != null) if (spawned instanceof Tameable && data.contains("tamed") && target != null)
{ {
final Tameable tameable = ((Tameable)spawned); final Tameable tameable = ((Tameable) spawned);
tameable.setTamed(true); tameable.setTamed(true);
tameable.setOwner(target.getPlayer()); tameable.setOwner(target.getPlayer());
data = data.replace("tamed", ""); data = data.replace("tamed", "");
} }
if (type == EntityType.WOLF && data.contains("angry")) if (type == EntityType.WOLF && data.contains("angry"))
{ {
((Wolf)spawned).setAngry(true); ((Wolf) spawned).setAngry(true);
} }
if (type == EntityType.CREEPER && data.contains("powered")) if (type == EntityType.CREEPER && data.contains("powered"))
{ {
((Creeper)spawned).setPowered(true); ((Creeper) spawned).setPowered(true);
} }
if (type == EntityType.OCELOT) if (type == EntityType.OCELOT)
{ {
if (data.contains("siamese") || data.contains("white")) if (data.contains("siamese") || data.contains("white"))
{ {
((Ocelot)spawned).setCatType(Ocelot.Type.SIAMESE_CAT); ((Ocelot) spawned).setCatType(Ocelot.Type.SIAMESE_CAT);
} }
else if (data.contains("red") || data.contains("orange") || data.contains("tabby")) else if (data.contains("red") || data.contains("orange") || data.contains("tabby"))
{ {
((Ocelot)spawned).setCatType(Ocelot.Type.RED_CAT); ((Ocelot) spawned).setCatType(Ocelot.Type.RED_CAT);
} }
else if (data.contains("black") || data.contains("tuxedo")) else if (data.contains("black") || data.contains("tuxedo"))
{ {
((Ocelot)spawned).setCatType(Ocelot.Type.BLACK_CAT); ((Ocelot) spawned).setCatType(Ocelot.Type.BLACK_CAT);
} }
} }
if (type == EntityType.VILLAGER) if (type == EntityType.VILLAGER)
@@ -277,31 +277,31 @@ public class SpawnMob
{ {
if (data.contains(prof.toString().toLowerCase(Locale.ENGLISH))) if (data.contains(prof.toString().toLowerCase(Locale.ENGLISH)))
{ {
((Villager)spawned).setProfession(prof); ((Villager) spawned).setProfession(prof);
} }
} }
} }
if (spawned instanceof Zombie) if (spawned instanceof Zombie)
{ {
if (data.contains("villager")) if (data.contains("villager"))
{ {
((Zombie)spawned).setVillager(true); ((Zombie) spawned).setVillager(true);
} }
if (data.contains("baby")) if (data.contains("baby"))
{ {
((Zombie)spawned).setBaby(true); ((Zombie) spawned).setBaby(true);
} }
} }
if (type == EntityType.SKELETON) if (type == EntityType.SKELETON)
{ {
if (data.contains("wither")) if (data.contains("wither"))
{ {
((Skeleton)spawned).setSkeletonType(Skeleton.SkeletonType.WITHER); ((Skeleton) spawned).setSkeletonType(Skeleton.SkeletonType.WITHER);
} }
} }
if (type == EntityType.EXPERIENCE_ORB) if (type == EntityType.EXPERIENCE_ORB)
{ {
((ExperienceOrb)spawned).setExperience(Integer.parseInt(data)); ((ExperienceOrb) spawned).setExperience(Integer.parseInt(data));
} }
} }
} }

2
Essentials/src/net/ess3/commands/Commandspawnmob.java
View File

@@ -20,7 +20,7 @@ public class Commandspawnmob extends EssentialsCommand
} }
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 = 1; int mobCount = 1;
if (args.length >= 2) if (args.length >= 2)

4
EssentialsSigns/src/net/ess3/signs/signs/SignSpawnmob.java
View File

@@ -32,8 +32,8 @@ public class SignSpawnmob extends EssentialsSign
charge.isAffordableFor(player); charge.isAffordableFor(player);
try try
{ {
List<String> mobParts = SpawnMob.mobParts(sign.getLine(2)); List<String> mobParts = SpawnMob.mobParts(sign.getLine(2));
List<String> mobData = SpawnMob.mobData(sign.getLine(2)); List<String> mobData = SpawnMob.mobData(sign.getLine(2));
SpawnMob.spawnmob(ess, ess.getServer(), player, player, mobParts, mobData, Integer.parseInt(sign.getLine(1))); SpawnMob.spawnmob(ess, ess.getServer(), player, player, mobParts, mobData, Integer.parseInt(sign.getLine(1)));
} }
catch (Exception ex) catch (Exception ex)