diff options
| author | KHobbits <rob@khobbits.co.uk> | 2013-01-19 23:43:40 +0000 |
|---|---|---|
| committer | KHobbits <rob@khobbits.co.uk> | 2013-01-19 23:43:40 +0000 |
| commit | 39d37ba7f82fb66f6d9236f8338c357498cc320a (patch) | |
| tree | 182a3bcf22c4b4ccc888f34348480baac44b4d81 | |
| parent | 56bc3cc4fa3845cff41885c60d9499b0d34908f8 (diff) | |
| download | Essentials-39d37ba7f82fb66f6d9236f8338c357498cc320a.tar Essentials-39d37ba7f82fb66f6d9236f8338c357498cc320a.tar.gz Essentials-39d37ba7f82fb66f6d9236f8338c357498cc320a.tar.lz Essentials-39d37ba7f82fb66f6d9236f8338c357498cc320a.tar.xz Essentials-39d37ba7f82fb66f6d9236f8338c357498cc320a.zip | |
Add example firework kit, and cleanup debug messages.
| -rw-r--r-- | Essentials/src/com/earth2me/essentials/Kit.java | 5 | ||||
| -rw-r--r-- | Essentials/src/com/earth2me/essentials/commands/Commandfirework.java | 21 | ||||
| -rw-r--r-- | Essentials/src/config.yml | 5 |
3 files changed, 7 insertions, 24 deletions
diff --git a/Essentials/src/com/earth2me/essentials/Kit.java b/Essentials/src/com/earth2me/essentials/Kit.java index 0b29f17ae..b2eb07373 100644 --- a/Essentials/src/com/earth2me/essentials/Kit.java +++ b/Essentials/src/com/earth2me/essentials/Kit.java @@ -120,10 +120,7 @@ public class Kit if (parts.length > 2) { - for (int i = 2; i < parts.length; i++) - { - metaStack.parseStringMeta(user, allowUnsafe, parts, 2, ess); - } + metaStack.parseStringMeta(user, allowUnsafe, parts, 2, ess); } final Map<Integer, ItemStack> overfilled; diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandfirework.java b/Essentials/src/com/earth2me/essentials/commands/Commandfirework.java index 06d59d442..567836420 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandfirework.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandfirework.java @@ -120,26 +120,7 @@ public class Commandfirework extends EssentialsCommand } else { - final ItemStack stack = user.getItemInHand(); - if (stack.getType() == Material.FIREWORK) - { - FireworkMeta fmeta = (FireworkMeta)stack.getItemMeta(); - List<FireworkEffect> effects = fmeta.getEffects(); - user.sendMessage("The firework you are holding has the following effects:"); - - for (FireworkEffect effect : effects) - { - StringBuilder effectDesc = new StringBuilder(); - effectDesc.append("Effect: "); - Map<String, Object> desc = effect.serialize(); - - for (String info : desc.keySet()) - { - effectDesc.append(info).append(": ").append(desc.get(info)).append(" "); - } - user.sendMessage(effectDesc.toString()); - } - } + throw new NotEnoughArgumentsException(); } } } diff --git a/Essentials/src/config.yml b/Essentials/src/config.yml index dd68dba05..bdd154838 100644 --- a/Essentials/src/config.yml +++ b/Essentials/src/config.yml @@ -232,6 +232,11 @@ kits: delay: 6000 items: - 387 1 title:&4Book_&9o_&6Colors author:KHobbits lore:Ingame_color_codes book:Colors + firework: + delay: 6000 + items: + - 401 1 name:Angry_Creeper color:red fade:green type:creeper power:1 + - 401 1 name:StarryNight color:yellow,orange fade:blue type:star effect:trail,twinkle power:1 # Essentials Sign Control # See http://wiki.ess3.net/wiki/Sign_Tutorial for instructions on how to use these. |