TotalFreedomMC/PlayerParticles
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/PlayerParticles.git synced 2025-07-12 16:54:19 +00:00
Code Issues Projects Releases Wiki Activity

'/pp edit' implemented, fix cmd material bug

Browse source
This commit is contained in:
Esophose 2018-10-16 02:38:12 -06:00
parent b4455e6686
commit 4fce663167
11 changed files with 329 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/com/esophose/playerparticles/command/AddCommandModule.java
View file

@ -19,7 +19,6 @@ import com.esophose.playerparticles.particles.ParticleEffect.ParticleProperty;
import com.esophose.playerparticles.particles.ParticleGroup;
import com.esophose.playerparticles.particles.ParticlePair;
import com.esophose.playerparticles.styles.api.ParticleStyle;
import com.esophose.playerparticles.styles.api.ParticleStyleManager;
import com.esophose.playerparticles.util.ParticleUtils;
public class AddCommandModule implements CommandModule {
@ -39,7 +38,7 @@ public class AddCommandModule implements CommandModule {
return;
}
ParticleStyle style = ParticleStyleManager.styleFromString(args[1]);
ParticleStyle style = ParticleStyle.fromName(args[1]);
if (style == null) {
LangManager.sendMessage(pplayer, Lang.STYLE_INVALID, args[1]);
return;
@ -103,7 +102,7 @@ public class AddCommandModule implements CommandModule {
if (effect == ParticleEffect.BLOCK || effect == ParticleEffect.FALLING_DUST) {
try {
blockData = ParticleUtils.closestMatch(args[2]);
if (blockData == null) throw new Exception();
if (blockData == null || !blockData.isBlock()) throw new Exception();
} catch (Exception e) {
LangManager.sendMessage(pplayer, Lang.DATA_INVALID_BLOCK);
return;
@ -111,7 +110,7 @@ public class AddCommandModule implements CommandModule {
} else if (effect == ParticleEffect.ITEM) {
try {
itemData = ParticleUtils.closestMatch(args[2]);
if (itemData == null) throw new Exception();
if (itemData == null || itemData.isBlock()) throw new Exception();
} catch (Exception e) {
LangManager.sendMessage(pplayer, Lang.DATA_INVALID_ITEM);
return;