From 55f9092aa6cc57b2ce43b06840e8edc131f5777e Mon Sep 17 00:00:00 2001 From: T00thpick1 Date: Mon, 13 May 2013 21:17:38 -0400 Subject: [PATCH] Fireworks adjustment --- src/main/java/com/gmail/nossr50/config/Config.java | 1 + .../com/gmail/nossr50/util/skills/ParticleEffectUtils.java | 2 +- src/main/resources/config.yml | 3 +++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/gmail/nossr50/config/Config.java b/src/main/java/com/gmail/nossr50/config/Config.java index 7f0e47177..28dbeb489 100644 --- a/src/main/java/com/gmail/nossr50/config/Config.java +++ b/src/main/java/com/gmail/nossr50/config/Config.java @@ -150,6 +150,7 @@ public class Config extends AutoUpdateConfigLoader { public boolean getGreaterImpactEffectEnabled() { return config.getBoolean("Particles.Greater_Impact", true); } public boolean getLevelUpEffectsEnabled() { return config.getBoolean("Particles.LevelUp_Enabled", true); } public int getLevelUpEffectsTier() { return config.getInt("Particles.LevelUp_Tier", 100); } + public boolean getLargeFireworks() { return config.getBoolean("Particles.LargeFireworks", true); } /* PARTY SETTINGS */ public int getAutoPartyKickInterval() { return config.getInt("Party.AutoKick_Interval", 12); } diff --git a/src/main/java/com/gmail/nossr50/util/skills/ParticleEffectUtils.java b/src/main/java/com/gmail/nossr50/util/skills/ParticleEffectUtils.java index 8c72ffcbb..f2fbf896a 100644 --- a/src/main/java/com/gmail/nossr50/util/skills/ParticleEffectUtils.java +++ b/src/main/java/com/gmail/nossr50/util/skills/ParticleEffectUtils.java @@ -90,7 +90,7 @@ public final class ParticleEffectUtils { Firework firework = (Firework) player.getWorld().spawnEntity(location, EntityType.FIREWORK); FireworkMeta fireworkMeta = firework.getFireworkMeta(); - FireworkEffect effect = FireworkEffect.builder().flicker(false).withColor(color).with(Type.BALL_LARGE).trail(true).build(); + FireworkEffect effect = FireworkEffect.builder().flicker(false).withColor(color).with((Config.getInstance().getLargeFireworks() ? Type.BALL_LARGE : Type.BALL)).trail(true).build(); fireworkMeta.addEffect(effect); fireworkMeta.addEffect(effect); fireworkMeta.setPower(0); diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml index 13f1cebd4..641ce2b5f 100644 --- a/src/main/resources/config.yml +++ b/src/main/resources/config.yml @@ -411,6 +411,9 @@ Particles: Ability_Activation: true Ability_Deactivation: true + # Determines if the fireworks should be a large ball or a small one + LargeFireworks: true + # Use particle effect when these abilities trigger Dodge: true Bleed: true