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

Bug fix relating to opening GUI without a particle of ID 1

Browse source
This commit is contained in:
Esophose 2018-12-03 01:38:56 -07:00
parent b9e8aa3028
commit c71bd75b53
3 changed files with 21 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/com/esophose/playerparticles/PlayerParticles.java
View file

@ -1,9 +1,15 @@
/*
* TODO: v6.1
* * Write a class called ConfigManager which manages updating the config.yml between versions so it doesn't have to be deleted every time
* + Add \n support for GUI messages to break lore onto a new line
* * Make the GUI ignore empty lore lines rather than putting an empty line there
*
* TODO: v6.2
* + Add new style 'tornado'
* + Add new style 'doubleorbit'
* + Add new style 'wings_<type>', multiple new wing types: fairy, demon
* * Create lore line parser
* * Make it so lore lines of the GUI are removed if the string is empty in the config
* * Add ability to add line breaks to the lore with \n
*/
package com.esophose.playerparticles;

4
src/com/esophose/playerparticles/gui/GuiInventoryDefault.java
View file

@ -82,8 +82,8 @@ public class GuiInventoryDefault extends GuiInventory {
});
this.actionButtons.add(loadPresetGroups);
final ParticlePair editingParticle = pplayer.getActiveParticles().isEmpty() ? ParticlePair.getNextDefault(pplayer) : pplayer.getActiveParticle(1);
boolean canEditPrimaryStyleAndData = !pplayer.getActiveParticles().isEmpty();
final ParticlePair editingParticle = pplayer.getPrimaryParticle();
boolean canEditPrimaryStyleAndData = pplayer.getActiveParticle(1) != null;
boolean doesEffectUseData = editingParticle.getEffect().hasProperty(ParticleProperty.COLORABLE) || editingParticle.getEffect().hasProperty(ParticleProperty.REQUIRES_MATERIAL_DATA);
// Edit Primary Effect

12
src/com/esophose/playerparticles/particles/PPlayer.java
View file

@ -255,5 +255,17 @@ public class PPlayer {
ids[i] = activeParticles.get(i).getId();
return ParticleUtils.getSmallestPositiveInt(ids);
}
/**
* Gets the primary particle (ID 1) for the PPlayer
* @return
*/
public ParticlePair getPrimaryParticle() {
ParticlePair primaryParticle = this.getActiveParticle(1);
if (primaryParticle == null) {
primaryParticle = ParticlePair.getNextDefault(this);
}
return primaryParticle;
}
}