TotalFreedomMC/PlayerParticles
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/PlayerParticles.git synced 2025-02-11 03:29:53 +00:00
Code Issues Projects Releases Wiki Activity

Fixed bug when trying to use '/pp remove fishing'

Browse source
This commit is contained in:
Esophose 2020-05-19 17:16:13 -06:00
parent 426313ca7e
commit 2521f01d9a
1 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/main/java/dev/esophose/playerparticles/command/RemoveCommandModule.java
View file

@ -53,6 +53,8 @@ public class RemoveCommandModule implements CommandModule {
} else { // Removing by effect/style name } else { // Removing by effect/style name
ParticleEffect effect = ParticleEffect.fromName(args[0]); ParticleEffect effect = ParticleEffect.fromName(args[0]);
ParticleStyle style = ParticleStyle.fromName(args[0]); ParticleStyle style = ParticleStyle.fromName(args[0]);
boolean removed = false;
if (effect != null) { if (effect != null) {
Set<Integer> toRemove = new HashSet<>(); Set<Integer> toRemove = new HashSet<>();
@ -66,10 +68,13 @@ public class RemoveCommandModule implements CommandModule {
if (toRemove.size() > 0) { if (toRemove.size() > 0) {
PlayerParticlesAPI.getInstance().savePlayerParticleGroup(pplayer.getPlayer(), activeGroup); PlayerParticlesAPI.getInstance().savePlayerParticleGroup(pplayer.getPlayer(), activeGroup);
localeManager.sendMessage(pplayer, "remove-effect-success", StringPlaceholders.builder("amount", toRemove.size()).addPlaceholder("effect", effect.getName()).build()); localeManager.sendMessage(pplayer, "remove-effect-success", StringPlaceholders.builder("amount", toRemove.size()).addPlaceholder("effect", effect.getName()).build());
} else { removed = true;
} else if (style == null) {
localeManager.sendMessage(pplayer, "remove-effect-none", StringPlaceholders.single("effect", effect.getName())); localeManager.sendMessage(pplayer, "remove-effect-none", StringPlaceholders.single("effect", effect.getName()));
} }
} else if (style != null) { }
if (style != null) {
Set<Integer> toRemove = new HashSet<>(); Set<Integer> toRemove = new HashSet<>();
ParticleGroup activeGroup = pplayer.getActiveParticleGroup(); ParticleGroup activeGroup = pplayer.getActiveParticleGroup();
for (int id : activeGroup.getParticles().keySet()) for (int id : activeGroup.getParticles().keySet())
@ -81,12 +86,14 @@ public class RemoveCommandModule implements CommandModule {
if (toRemove.size() > 0) { if (toRemove.size() > 0) {
PlayerParticlesAPI.getInstance().savePlayerParticleGroup(pplayer.getPlayer(), activeGroup); PlayerParticlesAPI.getInstance().savePlayerParticleGroup(pplayer.getPlayer(), activeGroup);
localeManager.sendMessage(pplayer, "remove-style-success", StringPlaceholders.builder("amount", toRemove.size()).addPlaceholder("style", style.getName()).build()); localeManager.sendMessage(pplayer, "remove-style-success", StringPlaceholders.builder("amount", toRemove.size()).addPlaceholder("style", style.getName()).build());
} else { removed = true;
} else if (effect == null) {
localeManager.sendMessage(pplayer, "remove-style-none", StringPlaceholders.single("style", style.getName())); localeManager.sendMessage(pplayer, "remove-style-none", StringPlaceholders.single("style", style.getName()));
} }
} else {
localeManager.sendMessage(pplayer, "remove-unknown", StringPlaceholders.single("name", args[0]));
} }
if (!removed)
localeManager.sendMessage(pplayer, "remove-unknown", StringPlaceholders.single("name", args[0]));
} }
} }