PandacubeFr/DiscoSheep
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

removed redundant temp hashmap, removed "PLAYER" from entity list

Browse Source
This commit is contained in:
Gibstick 2013-07-27 11:32:58 -04:00
parent 675162b501
commit 2e8359aa15
1 changed files with 9 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/ca/gibstick/discosheep/DiscoSheep.java
View File

@ -41,33 +41,23 @@ public final class DiscoSheep extends JavaPlugin {
getConfig().addDefault("default.duration", toSeconds_i(DiscoParty.defaultDuration)); getConfig().addDefault("default.duration", toSeconds_i(DiscoParty.defaultDuration));
getConfig().addDefault("default.period-ticks", DiscoParty.defaultPeriod); getConfig().addDefault("default.period-ticks", DiscoParty.defaultPeriod);
Map<String, Integer> tempMap = new HashMap<String, Integer>(); // temporary map to store guest config values /*
* Iterate through all live entities and create default configuration values for them
* excludes bosses and pigmen since they throw NPE for some reason
// create a default hashmap of <EntityType, 0> for all living entities * excludes horses for 1.5.2 compatibility (also NPE)
// this creates a default config entry with all living entites present */
// except for bosses, pigzombie (NPE for some reason)
// and horses (until 1.6.2 stable)
for (EntityType ent : EntityType.values()) { for (EntityType ent : EntityType.values()) {
if (ent.isAlive() if (ent.isAlive()
&& !ent.equals(EntityType.ENDER_DRAGON) && !ent.equals(EntityType.ENDER_DRAGON)
&& !ent.equals(EntityType.WITHER) && !ent.equals(EntityType.WITHER)
&& !ent.equals(EntityType.PIG_ZOMBIE) && !ent.equals(EntityType.PIG_ZOMBIE)
&& !ent.equals(EntityType.HORSE)) { && !ent.equals(EntityType.HORSE)
tempMap.put(ent.toString(), 0); && !ent.equals(EntityType.PLAYER)) {
getConfig().addDefault("default.guests." + ent.toString(), 0);
getConfig().addDefault("max.guests." + ent.toString(), 0);
} }
} }
for (Map.Entry<String, Integer> entry : tempMap.entrySet()) {
getConfig().addDefault("default.guests." + entry.getKey(), entry.getValue());
}
// same thing, but for limits (no default limits)
for (Map.Entry<String, Integer> entry : tempMap.entrySet()) {
getConfig().addDefault("max.guests." + entry.getKey(), entry.getValue());
}
loadConfigFromDisk(); loadConfigFromDisk();
} }