H8-Network/VillagerOptimizer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix logic order for optimize event

Browse Source
This commit is contained in:
xGinko 2023-10-01 14:28:24 +02:00
parent 09b325020b
commit 53d2bea1dd
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
VillagerOptimizer-1.16.5/src/main/java/me/xginko/villageroptimizer/modules/optimizations/OptimizeByNametag.java
View File

@ -90,15 +90,15 @@ public class OptimizeByNametag implements VillagerOptimizerModule, Listener {
if (nametags.contains(name.toLowerCase())) { if (nametags.contains(name.toLowerCase())) {
if (wVillager.canOptimize(cooldown) || player.hasPermission(Permissions.Bypass.NAMETAG_COOLDOWN.get())) { if (wVillager.canOptimize(cooldown) || player.hasPermission(Permissions.Bypass.NAMETAG_COOLDOWN.get())) {
VillagerOptimizeEvent optimizeEvent = new VillagerOptimizeEvent(wVillager, OptimizationType.NAMETAG, event.isAsynchronous());
VillagerOptimizer.callEvent(optimizeEvent);
if (optimizeEvent.isCancelled()) return;
if (!consumeNametag) { if (!consumeNametag) {
event.setCancelled(true); event.setCancelled(true);
villager.customName(newVillagerName); villager.customName(newVillagerName);
} }
VillagerOptimizeEvent optimizeEvent = new VillagerOptimizeEvent(wVillager, OptimizationType.NAMETAG, event.isAsynchronous());
VillagerOptimizer.callEvent(optimizeEvent);
if (optimizeEvent.isCancelled()) return;
wVillager.setOptimization(optimizeEvent.getOptimizationType()); wVillager.setOptimization(optimizeEvent.getOptimizationType());
wVillager.saveOptimizeTime(); wVillager.saveOptimizeTime();

8
VillagerOptimizer-1.20.2/src/main/java/me/xginko/villageroptimizer/modules/optimizations/OptimizeByNametag.java
View File

@ -90,15 +90,15 @@ public class OptimizeByNametag implements VillagerOptimizerModule, Listener {
if (nametags.contains(name.toLowerCase())) { if (nametags.contains(name.toLowerCase())) {
if (wVillager.canOptimize(cooldown) || player.hasPermission(Permissions.Bypass.NAMETAG_COOLDOWN.get())) { if (wVillager.canOptimize(cooldown) || player.hasPermission(Permissions.Bypass.NAMETAG_COOLDOWN.get())) {
VillagerOptimizeEvent optimizeEvent = new VillagerOptimizeEvent(wVillager, OptimizationType.NAMETAG, event.isAsynchronous());
VillagerOptimizer.callEvent(optimizeEvent);
if (optimizeEvent.isCancelled()) return;
if (!consumeNametag) { if (!consumeNametag) {
event.setCancelled(true); event.setCancelled(true);
villager.customName(newVillagerName); villager.customName(newVillagerName);
} }
VillagerOptimizeEvent optimizeEvent = new VillagerOptimizeEvent(wVillager, OptimizationType.NAMETAG, event.isAsynchronous());
VillagerOptimizer.callEvent(optimizeEvent);
if (optimizeEvent.isCancelled()) return;
wVillager.setOptimization(optimizeEvent.getOptimizationType()); wVillager.setOptimization(optimizeEvent.getOptimizationType());
wVillager.saveOptimizeTime(); wVillager.saveOptimizeTime();