TotalFreedomMC/PlayerParticles
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/PlayerParticles.git synced 2025-08-05 20:13:03 +00:00
Code Issues Projects Releases Wiki Activity

Fix wrong message key

Browse source
This commit is contained in:
Esophose 2020-01-15 23:34:37 -07:00
parent 5a808dbc61
commit 35f0495a0f
4 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/main/java/dev/esophose/playerparticles/PlayerParticles.java
View file

@ -2,7 +2,6 @@
* TODO: v7.0 * TODO: v7.0
* + Add ability to create/manage fixed effects from the GUI * + Add ability to create/manage fixed effects from the GUI
* * Convert fixed effect ids into names * * Convert fixed effect ids into names
* + Add effect/style name customization through config files
* + Add effect/style settings folder that lets you disable effects/style and edit style properties * + Add effect/style settings folder that lets you disable effects/style and edit style properties
* + Add setting to disable particles while in combat * + Add setting to disable particles while in combat
* + Add a command aliases section to the config * + Add a command aliases section to the config
@ -10,6 +9,7 @@
*/ */
/* /*
* + Add effect/style name customization through config files
* * Fixed the 'swords' style so you have to be holding a sword/trident * * Fixed the 'swords' style so you have to be holding a sword/trident
* * Fixed several styles ignoring the disabled worlds setting * * Fixed several styles ignoring the disabled worlds setting
* + Added a setting 'dust-size' to change the size of dust particles in 1.13+ * + Added a setting 'dust-size' to change the size of dust particles in 1.13+
@ -26,6 +26,7 @@
* * Fixed an issue where 'random' data would not parse properly in preset_groups.yml * * Fixed an issue where 'random' data would not parse properly in preset_groups.yml
* * Fixed an issue where preset groups would not display in the GUI even if the player has permission for them * * Fixed an issue where preset groups would not display in the GUI even if the player has permission for them
* + Added permission playerparticles.override for /ppo * + Added permission playerparticles.override for /ppo
* * Changed how * permissions are handled, negative permissions should work now
*/ */
/* /*

4
src/main/java/dev/esophose/playerparticles/command/GUICommandModule.java
View file

@ -35,9 +35,9 @@ public class GUICommandModule implements CommandModule {
return; return;
} }
if (!Setting.GUI_PRESETS_ONLY.getBoolean() && permissionManager.getEffectNamesUserHasPermissionFor(pplayer.getPlayer()).isEmpty()) { if (!Setting.GUI_PRESETS_ONLY.getBoolean() && (permissionManager.getEffectsUserHasPermissionFor(pplayer.getPlayer()).isEmpty() || permissionManager.getStylesUserHasPermissionFor(pplayer.getPlayer()).isEmpty())) {
if (byDefault) { if (byDefault) {
localeManager.sendMessage(pplayer, "command-error-no-effects"); localeManager.sendMessage(pplayer, "command-error-missing-effects-or-styles");
} else { } else {
localeManager.sendMessage(pplayer, "command-error-unknown"); localeManager.sendMessage(pplayer, "command-error-unknown");
} }

4
src/main/java/dev/esophose/playerparticles/command/OtherCommandModule.java
View file

@ -44,9 +44,9 @@ public class OtherCommandModule implements CommandModuleSecondary {
return; return;
} }
if (commandModule.requiresEffectsAndStyles() && (permissionManager.getEffectNamesUserHasPermissionFor(other).isEmpty() || permissionManager.getStyleNamesUserHasPermissionFor(other).isEmpty())) { if (commandModule.requiresEffectsAndStyles() && (permissionManager.getEffectsUserHasPermissionFor(other).isEmpty() || permissionManager.getStylesUserHasPermissionFor(other).isEmpty())) {
localeManager.sendMessage(sender, "other-success", StringPlaceholders.single("player", other.getName())); localeManager.sendMessage(sender, "other-success", StringPlaceholders.single("player", other.getName()));
localeManager.sendMessage(sender, "command-error-no-effects"); localeManager.sendMessage(sender, "command-error-missing-effects-or-styles");
return; return;
} }

4
src/main/java/dev/esophose/playerparticles/manager/CommandManager.java
View file

@ -161,8 +161,8 @@ public class CommandManager extends Manager implements CommandExecutor, TabCompl
this.playerParticles.getManager(DataManager.class).getPPlayer(p.getUniqueId(), (pplayer) -> { this.playerParticles.getManager(DataManager.class).getPPlayer(p.getUniqueId(), (pplayer) -> {
PermissionManager permissionManager = PlayerParticles.getInstance().getManager(PermissionManager.class); PermissionManager permissionManager = PlayerParticles.getInstance().getManager(PermissionManager.class);
if (commandModule.requiresEffectsAndStyles() && (permissionManager.getEffectNamesUserHasPermissionFor(p).isEmpty() || permissionManager.getStyleNamesUserHasPermissionFor(p).isEmpty())) { if (commandModule.requiresEffectsAndStyles() && (permissionManager.getEffectsUserHasPermissionFor(p).isEmpty() || permissionManager.getStylesUserHasPermissionFor(p).isEmpty())) {
localeManager.sendMessage(pplayer, "command-error-no-effects"); localeManager.sendMessage(pplayer, "command-error-missing-effects-or-styles");
} else { } else {
commandModule.onCommandExecute(pplayer, cmdArgs); commandModule.onCommandExecute(pplayer, cmdArgs);
} }