Repo-Mirror/EcoEnchants
9
0
Fork 0
Code Issues Releases 1 Activity

Fixed NPE from ItemConversions when plugin hasn't finished loading

Browse Source
This commit is contained in:
Auxilor
2021-04-27 12:35:20 +01:00
parent 51f046bd97
commit d63e0ead6f
1 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/util/ItemConversions.java
View File

@@ -48,6 +48,10 @@ public class ItemConversions extends PluginDependent implements Listener {
*/
@EventHandler
public void loreConverter(@NotNull final PlayerItemHeldEvent event) {
if (this.getPlugin().getDisplayModule() == null) { // If plugin hasn't finished loading.
return;
}
if (!((EnchantDisplay) this.getPlugin().getDisplayModule()).getOptions().isUsingLoreGetter()) {
return;
}
@@ -66,6 +70,10 @@ public class ItemConversions extends PluginDependent implements Listener {
*/
@EventHandler
public void aggressiveLoreConverter(@NotNull final InventoryOpenEvent event) {
if (this.getPlugin().getDisplayModule() == null) { // If plugin hasn't finished loading.
return;
}
if (!((EnchantDisplay) this.getPlugin().getDisplayModule()).getOptions().isUsingAggressiveLoreGetter()) {
return;
}
@@ -163,6 +171,10 @@ public class ItemConversions extends PluginDependent implements Listener {
*/
@EventHandler
public void hideFixer(@NotNull final PlayerItemHeldEvent event) {
if (this.getPlugin().getDisplayModule() == null) { // If plugin hasn't finished loading.
return;
}
if (!((EnchantDisplay) this.getPlugin().getDisplayModule()).getOptions().isUsingExperimentalHideFixer()) {
return;
}
@@ -181,6 +193,10 @@ public class ItemConversions extends PluginDependent implements Listener {
*/
@EventHandler
public void aggressiveHideFixer(@NotNull final InventoryOpenEvent event) {
if (this.getPlugin().getDisplayModule() == null) { // If plugin hasn't finished loading.
return;
}
if (!((EnchantDisplay) this.getPlugin().getDisplayModule()).getOptions().isUsingAggressiveExperimentalHideFixer()) {
return;
}