Skip to content

Commit 87641b1

Browse files
committed
expand module enable & disable logging
1 parent 627ed67 commit 87641b1

File tree

2 files changed

+30
-6
lines changed
  • AnarchyExploitFixesFolia/src/main/java/me/xginko/aef/modules
  • AnarchyExploitFixesLegacy/src/main/java/me/xginko/aef/modules

2 files changed

+30
-6
lines changed

AnarchyExploitFixesFolia/src/main/java/me/xginko/aef/modules/AEFModule.java

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
import me.xginko.aef.modules.packets.PacketModule;
77
import me.xginko.aef.utils.models.ConditionalEnableable;
88
import me.xginko.aef.utils.models.Disableable;
9-
import me.xginko.aef.utils.models.Enableable;
109
import org.reflections.Reflections;
1110
import org.reflections.scanners.Scanners;
1211

@@ -74,7 +73,13 @@ public boolean shouldEnable() {
7473
}
7574

7675
public static void disableAll() {
77-
ENABLED_MODULES.forEach(Disableable::disable);
76+
for (AEFModule module : ENABLED_MODULES) {
77+
try {
78+
module.disable();
79+
} catch (Throwable t) {
80+
module.error("Failed during disable. " + t.getLocalizedMessage());
81+
}
82+
}
7883
ENABLED_MODULES.clear();
7984
}
8085

@@ -100,7 +105,14 @@ public static void reloadModules() {
100105
}
101106
}
102107

103-
ENABLED_MODULES.forEach(Enableable::enable);
108+
for (AEFModule module : ENABLED_MODULES) {
109+
try {
110+
module.enable();
111+
} catch (Throwable t) {
112+
module.error("Failed during enable. " + t.getLocalizedMessage());
113+
try { module.disable(); } catch (Throwable ignored) {}
114+
}
115+
}
104116
}
105117

106118
protected void error(String message, Throwable throwable) {

AnarchyExploitFixesLegacy/src/main/java/me/xginko/aef/modules/AEFModule.java

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
import me.xginko.aef.modules.packets.PacketModule;
77
import me.xginko.aef.utils.models.ConditionalEnableable;
88
import me.xginko.aef.utils.models.Disableable;
9-
import me.xginko.aef.utils.models.Enableable;
109
import org.reflections.Reflections;
1110
import org.reflections.scanners.Scanners;
1211

@@ -75,7 +74,13 @@ public boolean shouldEnable() {
7574
}
7675

7776
public static void disableAll() {
78-
ENABLED_MODULES.forEach(Disableable::disable);
77+
for (AEFModule module : ENABLED_MODULES) {
78+
try {
79+
module.disable();
80+
} catch (Throwable t) {
81+
module.error("Failed during disable. " + t.getLocalizedMessage());
82+
}
83+
}
7984
ENABLED_MODULES.clear();
8085
}
8186

@@ -101,7 +106,14 @@ public static void reloadModules() {
101106
}
102107
}
103108

104-
ENABLED_MODULES.forEach(Enableable::enable);
109+
for (AEFModule module : ENABLED_MODULES) {
110+
try {
111+
module.enable();
112+
} catch (Throwable t) {
113+
module.error("Failed during enable. " + t.getLocalizedMessage());
114+
try { module.disable(); } catch (Throwable ignored) {}
115+
}
116+
}
105117
}
106118

107119
protected void error(String message, Throwable throwable) {

0 commit comments

Comments
 (0)