34
34
import com .j256 .ormlite .table .TableInfo ;
35
35
import com .j256 .ormlite .table .TableUtils ;
36
36
import com .velocitypowered .api .command .CommandManager ;
37
+ import com .velocitypowered .api .command .CommandMeta ;
37
38
import com .velocitypowered .api .event .EventManager ;
38
39
import com .velocitypowered .api .event .Subscribe ;
39
40
import com .velocitypowered .api .event .proxy .ProxyInitializeEvent ;
@@ -343,7 +344,6 @@ public void reload() {
343
344
manager .unregister ("changepassword" );
344
345
manager .unregister ("forcechangepassword" );
345
346
manager .unregister ("destroysession" );
346
- manager .unregister ("2fa" );
347
347
manager .unregister ("limboauth" );
348
348
349
349
manager .register ("unregister" , new UnregisterCommand (this , this .playerDao ), "unreg" );
@@ -354,7 +354,13 @@ public void reload() {
354
354
manager .register ("forcechangepassword" , new ForceChangePasswordCommand (this , this .server , this .playerDao ), "forcechangepass" , "fcp" );
355
355
manager .register ("destroysession" , new DestroySessionCommand (this ), "logout" );
356
356
if (Settings .IMP .MAIN .ENABLE_TOTP ) {
357
- manager .register ("2fa" , new TotpCommand (this .playerDao ), "totp" );
357
+ CommandMeta meta = manager .metaBuilder ("2fa" ).aliases ("totp" ).plugin (this ).build ();
358
+ manager .register (meta , new TotpCommand (this .playerDao ));
359
+ } else {
360
+ CommandMeta meta = manager .getCommandMeta ("2fa" );
361
+ if (meta != null && this .equals (meta .getPlugin ())) {
362
+ manager .unregister ("2fa" );
363
+ }
358
364
}
359
365
manager .register ("limboauth" , new LimboAuthCommand (this ), "la" , "auth" , "lauth" );
360
366
0 commit comments