diff --git a/API/api/pom.xml b/API/api/pom.xml
index 252fb6a..130ccb8 100644
--- a/API/api/pom.xml
+++ b/API/api/pom.xml
@@ -5,7 +5,7 @@
tc.oc
api-parent
../pom.xml
- 1.12.1-SNAPSHOT
+ 1.12.2-SNAPSHOT
api
diff --git a/API/bukkit/pom.xml b/API/bukkit/pom.xml
index d782ae1..382c54b 100644
--- a/API/bukkit/pom.xml
+++ b/API/bukkit/pom.xml
@@ -5,7 +5,7 @@
tc.oc
api-parent
../pom.xml
- 1.12.1-SNAPSHOT
+ 1.12.2-SNAPSHOT
api-bukkit
diff --git a/API/bungee/pom.xml b/API/bungee/pom.xml
index f7fea45..bd56e2c 100644
--- a/API/bungee/pom.xml
+++ b/API/bungee/pom.xml
@@ -5,7 +5,7 @@
tc.oc
api-parent
../pom.xml
- 1.12.1-SNAPSHOT
+ 1.12.2-SNAPSHOT
api-bungee
diff --git a/API/minecraft/pom.xml b/API/minecraft/pom.xml
index b160e29..7008a0a 100644
--- a/API/minecraft/pom.xml
+++ b/API/minecraft/pom.xml
@@ -5,7 +5,7 @@
tc.oc
api-parent
../pom.xml
- 1.12.1-SNAPSHOT
+ 1.12.2-SNAPSHOT
api-minecraft
diff --git a/API/ocn/pom.xml b/API/ocn/pom.xml
index e27443c..15c7d59 100644
--- a/API/ocn/pom.xml
+++ b/API/ocn/pom.xml
@@ -5,7 +5,7 @@
tc.oc
api-parent
../pom.xml
- 1.12.1-SNAPSHOT
+ 1.12.2-SNAPSHOT
api-ocn
diff --git a/API/pom.xml b/API/pom.xml
index dcc9e49..b04d1d5 100644
--- a/API/pom.xml
+++ b/API/pom.xml
@@ -5,7 +5,7 @@
tc.oc
ProjectAres
../pom.xml
- 1.12.1-SNAPSHOT
+ 1.12.2-SNAPSHOT
api-parent
diff --git a/Commons/bukkit/pom.xml b/Commons/bukkit/pom.xml
index 4d33968..e8f8f5b 100644
--- a/Commons/bukkit/pom.xml
+++ b/Commons/bukkit/pom.xml
@@ -8,7 +8,7 @@
commons
tc.oc
../pom.xml
- 1.12.1-SNAPSHOT
+ 1.12.2-SNAPSHOT
commons-bukkit
diff --git a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/commands/ServerCommands.java b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/commands/ServerCommands.java
index acc751c..9549681 100644
--- a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/commands/ServerCommands.java
+++ b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/commands/ServerCommands.java
@@ -13,6 +13,7 @@ import com.sk89q.minecraft.util.commands.Command;
import com.sk89q.minecraft.util.commands.CommandContext;
import com.sk89q.minecraft.util.commands.CommandException;
import com.sk89q.minecraft.util.commands.CommandPermissions;
+import com.sk89q.minecraft.util.commands.CommandPermissionsException;
import net.md_5.bungee.api.ChatColor;
import net.md_5.bungee.api.chat.BaseComponent;
import net.md_5.bungee.api.chat.TranslatableComponent;
@@ -79,11 +80,12 @@ public class ServerCommands implements Commands {
aliases = { "servers", "srvs" },
desc = "Show a listing of all servers on the network",
usage = "[page]",
+ flags = "a",
min = 0,
max = 1
)
public void servers(final CommandContext args, final CommandSender sender) throws CommandException {
- final List servers = new ArrayList<>(serverStore.subset(teleporter::isVisible));
+ final List servers = new ArrayList<>(serverStore.subset(args.hasFlag('a') && sender.hasPermission("ocn.see-all-servers") ? teleporter::isConnectable : teleporter::isVisible));
Collections.sort(servers, FULLNESS);
new Paginator() {
diff --git a/Commons/bungee/pom.xml b/Commons/bungee/pom.xml
index 49d128b..5f6e2f6 100644
--- a/Commons/bungee/pom.xml
+++ b/Commons/bungee/pom.xml
@@ -8,7 +8,7 @@
commons
tc.oc
../pom.xml
- 1.12.1-SNAPSHOT
+ 1.12.2-SNAPSHOT
commons-bungee
diff --git a/Commons/core/pom.xml b/Commons/core/pom.xml
index 50b8402..c41bea6 100644
--- a/Commons/core/pom.xml
+++ b/Commons/core/pom.xml
@@ -8,7 +8,7 @@
commons
tc.oc
../pom.xml
- 1.12.1-SNAPSHOT
+ 1.12.2-SNAPSHOT
commons-core
diff --git a/Commons/pom.xml b/Commons/pom.xml
index f62859e..18f8598 100644
--- a/Commons/pom.xml
+++ b/Commons/pom.xml
@@ -8,7 +8,7 @@
tc.oc
ProjectAres
../pom.xml
- 1.12.1-SNAPSHOT
+ 1.12.2-SNAPSHOT
commons
diff --git a/Lobby/pom.xml b/Lobby/pom.xml
index ce9e9a9..0f584d7 100644
--- a/Lobby/pom.xml
+++ b/Lobby/pom.xml
@@ -5,7 +5,7 @@
tc.oc
ProjectAres
../pom.xml
- 1.12.1-SNAPSHOT
+ 1.12.2-SNAPSHOT
Lobby
diff --git a/PGM/pom.xml b/PGM/pom.xml
index af1df4e..b305dc2 100644
--- a/PGM/pom.xml
+++ b/PGM/pom.xml
@@ -5,7 +5,7 @@
tc.oc
ProjectAres
../pom.xml
- 1.12.1-SNAPSHOT
+ 1.12.2-SNAPSHOT
diff --git a/Tourney/pom.xml b/Tourney/pom.xml
index fbb27c1..d9c5245 100644
--- a/Tourney/pom.xml
+++ b/Tourney/pom.xml
@@ -5,7 +5,7 @@
tc.oc
ProjectAres
../pom.xml
- 1.12.1-SNAPSHOT
+ 1.12.2-SNAPSHOT
net.anxuiz
diff --git a/Util/bukkit/pom.xml b/Util/bukkit/pom.xml
index e12053c..0a9619c 100644
--- a/Util/bukkit/pom.xml
+++ b/Util/bukkit/pom.xml
@@ -8,7 +8,7 @@
util
tc.oc
../pom.xml
- 1.12.1-SNAPSHOT
+ 1.12.2-SNAPSHOT
util-bukkit
@@ -34,14 +34,14 @@
tc.oc
sportbukkit-api
- 1.12.1-R0.1-SNAPSHOT
+ 1.12.2-R0.1-SNAPSHOT
tc.oc
sportbukkit
- 1.12.1-R0.1-SNAPSHOT
+ 1.12.2-R0.1-SNAPSHOT
diff --git a/Util/bungee/pom.xml b/Util/bungee/pom.xml
index ba52b29..66f6ee7 100644
--- a/Util/bungee/pom.xml
+++ b/Util/bungee/pom.xml
@@ -8,7 +8,7 @@
util
tc.oc
../pom.xml
- 1.12.1-SNAPSHOT
+ 1.12.2-SNAPSHOT
util-bungee
diff --git a/Util/core/pom.xml b/Util/core/pom.xml
index cc4814a..ab64b54 100644
--- a/Util/core/pom.xml
+++ b/Util/core/pom.xml
@@ -8,7 +8,7 @@
util
tc.oc
../pom.xml
- 1.12.1-SNAPSHOT
+ 1.12.2-SNAPSHOT
util-core
diff --git a/Util/core/src/main/java/tc/oc/minecraft/protocol/MinecraftVersion.java b/Util/core/src/main/java/tc/oc/minecraft/protocol/MinecraftVersion.java
index d82c418..ed89091 100644
--- a/Util/core/src/main/java/tc/oc/minecraft/protocol/MinecraftVersion.java
+++ b/Util/core/src/main/java/tc/oc/minecraft/protocol/MinecraftVersion.java
@@ -24,7 +24,8 @@ public enum MinecraftVersion {
MINECRAFT_1_11(315, 1, 11, 0),
MINECRAFT_1_11_1(316, 1, 11, 1),
MINECRAFT_1_12(335, 1, 12, 0),
- MINECRAFT_1_12_1(338, 1, 12, 1);
+ MINECRAFT_1_12_1(338, 1, 12, 1),
+ MINECRAFT_1_12_2(340, 1, 12, 2);
private final int protocol;
private final int major;
diff --git a/Util/pom.xml b/Util/pom.xml
index d95a5a6..1966b68 100644
--- a/Util/pom.xml
+++ b/Util/pom.xml
@@ -8,7 +8,7 @@
tc.oc
ProjectAres
../pom.xml
- 1.12.1-SNAPSHOT
+ 1.12.2-SNAPSHOT
diff --git a/pom.xml b/pom.xml
index 4e059a4..716a01c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,13 +2,13 @@
4.0.0
- 1.12.1-SNAPSHOT
+ 1.12.2-SNAPSHOT
UTF-8
tc.oc
ProjectAres
- 1.12.1-SNAPSHOT
+ 1.12.2-SNAPSHOT
pom
@@ -200,12 +200,12 @@
tc.oc
sportbukkit-api
- 1.12.1-R0.1-SNAPSHOT
+ 1.12.2-R0.1-SNAPSHOT
tc.oc
sportbukkit
- 1.12.1-R0.1-SNAPSHOT
+ 1.12.2-R0.1-SNAPSHOT
com.sk89q