Skip to content

Commit 0c8ffb0

Browse files
committed
Fixed a bug causing internal errors when tab completing. Improved auth communication
1 parent f090180 commit 0c8ffb0

21 files changed

Lines changed: 87 additions & 35 deletions

pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<groupId>com.lielamar</groupId>
88
<artifactId>2fa</artifactId>
9-
<version>1.6.0</version>
9+
<version>1.6.1</version>
1010

1111
<properties>
1212
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -132,7 +132,7 @@
132132
<dependency>
133133
<groupId>com.lielamar</groupId>
134134
<artifactId>LielsUtils</artifactId>
135-
<version>1.6.27</version>
135+
<version>1.6.28</version>
136136
<scope>compile</scope>
137137
</dependency>
138138

src/main/java/com/lielamar/auth/bukkit/TwoFactorAuthentication.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,7 @@ public void setupAuth() {
9494
this.storageHandler = StorageHandler.loadStorageHandler(this.configHandler, getDataFolder().getAbsolutePath());
9595

9696
AuthCommunicationHandler authCommunicationHandler;
97+
9798
{
9899
if(this.configHandler.getCommunicationMethod() == CommunicationMethod.PROXY) {
99100
authCommunicationHandler = new ProxyAuthCommunication(this);
@@ -106,7 +107,7 @@ public void setupAuth() {
106107
}
107108
}
108109

109-
this.authHandler = new AuthHandler(this, storageHandler, authCommunicationHandler);
110+
this.authHandler = new AuthHandler(this, storageHandler, authCommunicationHandler, new BasicAuthCommunication(this));
110111
this.authTracker = new AuthTracker();
111112
}
112113

src/main/java/com/lielamar/auth/bukkit/commands/subcommands/CancelCommand.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public boolean runCommand(@NotNull CommandSender commandSender, @NotNull String[
4646
}
4747

4848
@Override
49-
public List<String> tabOptions(@NotNull CommandSender commandSender, @NotNull String[] strings) {
49+
public List<String> tabOptions(@NotNull CommandSender commandSender, @NotNull String[] args) {
5050
return new ArrayList<>();
5151
}
5252

src/main/java/com/lielamar/auth/bukkit/commands/subcommands/DisableCommand.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@ public boolean runCommand(@NotNull CommandSender commandSender, @NotNull String[
5454
}
5555

5656
@Override
57-
public List<String> tabOptions(@NotNull CommandSender commandSender, @NotNull String[] strings) {
58-
return new TabOptionsBuilder().player().build(new String[0]);
57+
public List<String> tabOptions(@NotNull CommandSender commandSender, @NotNull String[] args) {
58+
return new TabOptionsBuilder().player().build(args);
5959
}
6060

6161
@Override

src/main/java/com/lielamar/auth/bukkit/commands/subcommands/DisableForOthersCommand.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@ public boolean runCommand(@NotNull CommandSender commandSender, @NotNull String[
5454
}
5555

5656
@Override
57-
public List<String> tabOptions(@NotNull CommandSender commandSender, @NotNull String[] strings) {
58-
return new TabOptionsBuilder().player().build(new String[0]);
57+
public List<String> tabOptions(@NotNull CommandSender commandSender, @NotNull String[] args) {
58+
return new TabOptionsBuilder().player().build(args);
5959
}
6060

6161
@Override

src/main/java/com/lielamar/auth/bukkit/commands/subcommands/EnableCommand.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@ public boolean runCommand(@NotNull CommandSender commandSender, @NotNull String[
4747
}
4848

4949
@Override
50-
public List<String> tabOptions(@NotNull CommandSender commandSender, @NotNull String[] strings) {
51-
return new TabOptionsBuilder().player().build(new String[0]);
50+
public List<String> tabOptions(@NotNull CommandSender commandSender, @NotNull String[] args) {
51+
return new TabOptionsBuilder().player().build(args);
5252
}
5353

5454
@Override

src/main/java/com/lielamar/auth/bukkit/commands/subcommands/HelpCommand.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public boolean runCommand(@NotNull CommandSender commandSender, @NotNull String[
4545
}
4646

4747
@Override
48-
public List<String> tabOptions(@NotNull CommandSender commandSender, @NotNull String[] strings) {
48+
public List<String> tabOptions(@NotNull CommandSender commandSender, @NotNull String[] args) {
4949
return new ArrayList<>();
5050
}
5151

src/main/java/com/lielamar/auth/bukkit/commands/subcommands/LoginCommand.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public boolean runCommand(@NotNull CommandSender commandSender, @NotNull String[
6060
}
6161

6262
@Override
63-
public List<String> tabOptions(@NotNull CommandSender commandSender, @NotNull String[] strings) {
63+
public List<String> tabOptions(@NotNull CommandSender commandSender, @NotNull String[] args) {
6464
return new ArrayList<>();
6565
}
6666

src/main/java/com/lielamar/auth/bukkit/commands/subcommands/ReloadCommand.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public boolean runCommand(@NotNull CommandSender commandSender, @NotNull String[
4848
}
4949

5050
@Override
51-
public List<String> tabOptions(@NotNull CommandSender commandSender, @NotNull String[] strings) {
51+
public List<String> tabOptions(@NotNull CommandSender commandSender, @NotNull String[] args) {
5252
return new ArrayList<>();
5353
}
5454

src/main/java/com/lielamar/auth/bukkit/commands/subcommands/ReportCommand.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ public boolean runCommand(@NotNull CommandSender commandSender, @NotNull String[
9090
}
9191

9292
@Override
93-
public List<String> tabOptions(@NotNull CommandSender commandSender, @NotNull String[] strings) {
93+
public List<String> tabOptions(@NotNull CommandSender commandSender, @NotNull String[] args) {
9494
return new ArrayList<>();
9595
}
9696

0 commit comments

Comments
 (0)