Browse Source

Fireworks adjustment

T00thpick1 12 years ago
parent
commit
55f9092aa6

+ 1 - 0
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 getGreaterImpactEffectEnabled() { return config.getBoolean("Particles.Greater_Impact", true); }
     public boolean getLevelUpEffectsEnabled() { return config.getBoolean("Particles.LevelUp_Enabled", true); }
     public boolean getLevelUpEffectsEnabled() { return config.getBoolean("Particles.LevelUp_Enabled", true); }
     public int getLevelUpEffectsTier() { return config.getInt("Particles.LevelUp_Tier", 100); }
     public int getLevelUpEffectsTier() { return config.getInt("Particles.LevelUp_Tier", 100); }
+    public boolean getLargeFireworks() { return config.getBoolean("Particles.LargeFireworks", true); }
 
 
     /* PARTY SETTINGS */
     /* PARTY SETTINGS */
     public int getAutoPartyKickInterval() { return config.getInt("Party.AutoKick_Interval", 12); }
     public int getAutoPartyKickInterval() { return config.getInt("Party.AutoKick_Interval", 12); }

+ 1 - 1
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);
         Firework firework = (Firework) player.getWorld().spawnEntity(location, EntityType.FIREWORK);
         FireworkMeta fireworkMeta = firework.getFireworkMeta();
         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.addEffect(effect);
         fireworkMeta.addEffect(effect);
         fireworkMeta.setPower(0);
         fireworkMeta.setPower(0);

+ 3 - 0
src/main/resources/config.yml

@@ -411,6 +411,9 @@ Particles:
     Ability_Activation: true
     Ability_Activation: true
     Ability_Deactivation: 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
     # Use particle effect when these abilities trigger
     Dodge: true
     Dodge: true
     Bleed: true
     Bleed: true