Upstream/EcoEnchants
1
0
Fork 0
mirror of https://github.com/Auxilor/EcoEnchants.git synced 2025-01-27 01:11:21 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into develop

Browse Source
This commit is contained in:
Auxilor 2021-04-27 12:59:30 +01:00
commit 2eeff1c369
2 changed files with 17 additions and 1 deletions
Show Stats 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 @EventHandler
public void loreConverter(@NotNull final PlayerItemHeldEvent event) { 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()) { if (!((EnchantDisplay) this.getPlugin().getDisplayModule()).getOptions().isUsingLoreGetter()) {
return; return;
} }
@ -66,6 +70,10 @@ public class ItemConversions extends PluginDependent implements Listener {
*/ */
@EventHandler @EventHandler
public void aggressiveLoreConverter(@NotNull final InventoryOpenEvent event) { 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()) { if (!((EnchantDisplay) this.getPlugin().getDisplayModule()).getOptions().isUsingAggressiveLoreGetter()) {
return; return;
} }
@ -163,6 +171,10 @@ public class ItemConversions extends PluginDependent implements Listener {
*/ */
@EventHandler @EventHandler
public void hideFixer(@NotNull final PlayerItemHeldEvent event) { 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()) { if (!((EnchantDisplay) this.getPlugin().getDisplayModule()).getOptions().isUsingExperimentalHideFixer()) {
return; return;
} }
@ -181,6 +193,10 @@ public class ItemConversions extends PluginDependent implements Listener {
*/ */
@EventHandler @EventHandler
public void aggressiveHideFixer(@NotNull final InventoryOpenEvent event) { 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()) { if (!((EnchantDisplay) this.getPlugin().getDisplayModule()).getOptions().isUsingAggressiveExperimentalHideFixer()) {
return; return;
} }

2
gradle.properties
View File

@ -1,2 +1,2 @@
version = 7.2.11 version = 7.2.12
plugin-name = EcoEnchants plugin-name = EcoEnchants