summaryrefslogtreewikicommitdiff
diff options
context:
space:
mode:
authorTyler Murphy <tylerm@tylerm.dev>2023-07-07 10:44:16 -0400
committerTyler Murphy <tylerm@tylerm.dev>2023-07-07 10:44:16 -0400
commit86cbf25e0bc2b0550c6b28c1d51231880653f670 (patch)
tree1bc41a441a6a4102105c193093d37dc41699c73a
parentMerge pull request '1.7.3' (#8) from dev into main (diff)
downloadkenshinshideandseek-86cbf25e0bc2b0550c6b28c1d51231880653f670.tar.gz
kenshinshideandseek-86cbf25e0bc2b0550c6b28c1d51231880653f670.tar.bz2
kenshinshideandseek-86cbf25e0bc2b0550c6b28c1d51231880653f670.zip
update deps to 1.20
-rw-r--r--pom.xml8
-rw-r--r--src/main/java/net/tylermurphy/hideAndSeek/command/Join.java17
-rw-r--r--src/main/java/net/tylermurphy/hideAndSeek/command/util/CommandGroup.java2
-rw-r--r--src/main/resources/plugin.yml2
4 files changed, 8 insertions, 21 deletions
diff --git a/pom.xml b/pom.xml
index 629289f..0515362 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,7 +1,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"><modelVersion>4.0.0</modelVersion>
<groupId>net.tylermurphy</groupId>
<artifactId>KenshinsHideAndSeek</artifactId>
- <version>1.7.3</version>
+ <version>1.7.4</version>
<name>Hide and Seek Plugin</name>
<properties>
@@ -47,6 +47,10 @@
<artifact>*:*</artifact>
<excludes>
<exclude>META-INF/**</exclude>
+ <exclude>org/sqlite/native/Mac/**</exclude>
+ <exclude>org/sqlite/native/Linux-Android/**</exclude>
+ <exclude>org/sqlite/native/Linux/ppc64/**</exclude>
+ <exclude>org/sqlite/native/Linux/armv7/**</exclude>
</excludes>
</filter>
</filters>
@@ -120,7 +124,7 @@
<dependency>
<groupId>com.github.cryptomorin</groupId>
<artifactId>XSeries</artifactId>
- <version>9.3.1</version>
+ <version>9.4.0</version>
</dependency>
<dependency>
<groupId>me.clip</groupId>
diff --git a/src/main/java/net/tylermurphy/hideAndSeek/command/Join.java b/src/main/java/net/tylermurphy/hideAndSeek/command/Join.java
index 0c01265..3e724fb 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/command/Join.java
+++ b/src/main/java/net/tylermurphy/hideAndSeek/command/Join.java
@@ -2,13 +2,11 @@ package net.tylermurphy.hideAndSeek.command;
import net.tylermurphy.hideAndSeek.Main;
import net.tylermurphy.hideAndSeek.command.util.ICommand;
-import net.tylermurphy.hideAndSeek.configuration.Maps;
import org.bukkit.Bukkit;
import org.bukkit.entity.Player;
import org.jetbrains.annotations.NotNull;
import java.util.List;
-import java.util.stream.Collectors;
import static net.tylermurphy.hideAndSeek.configuration.Config.errorPrefix;
import static net.tylermurphy.hideAndSeek.configuration.Localization.message;
@@ -29,18 +27,6 @@ public class Join implements ICommand {
sender.sendMessage(errorPrefix + message("GAME_INGAME"));
return;
}
- if(args.length > 0) {
- if(Main.getInstance().getBoard().size() > 0) {
- sender.sendMessage(errorPrefix + message("LOBBY_IN_USE"));
- return;
- }
- net.tylermurphy.hideAndSeek.configuration.Map map = Maps.getMap(args[0]);
- if(map == null) {
- sender.sendMessage(errorPrefix + message("INVALID_MAP"));
- return;
- }
- Main.getInstance().getGame().setCurrentMap(map);
- }
Main.getInstance().getGame().join(player);
}
@@ -57,9 +43,6 @@ public class Join implements ICommand {
}
public List<String> autoComplete(@NotNull String parameter, @NotNull String typed) {
- if(parameter.equals("*map")) {
- return Maps.getAllMaps().stream().map(net.tylermurphy.hideAndSeek.configuration.Map::getName).collect(Collectors.toList());
- }
return null;
}
diff --git a/src/main/java/net/tylermurphy/hideAndSeek/command/util/CommandGroup.java b/src/main/java/net/tylermurphy/hideAndSeek/command/util/CommandGroup.java
index 80e531e..9bfdd0e 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/command/util/CommandGroup.java
+++ b/src/main/java/net/tylermurphy/hideAndSeek/command/util/CommandGroup.java
@@ -51,7 +51,7 @@ public class CommandGroup {
if (data == null) {
player.sendMessage(
- String.format("%s%sKenshin's Hide and Seek %s(%s1.7.3%s)\n", ChatColor.AQUA, ChatColor.BOLD, ChatColor.GRAY, ChatColor.WHITE, ChatColor.GRAY) +
+ String.format("%s%sKenshin's Hide and Seek %s(%s1.7.4%s)\n", ChatColor.AQUA, ChatColor.BOLD, ChatColor.GRAY, ChatColor.WHITE, ChatColor.GRAY) +
String.format("%sAuthor: %s[KenshinEto]\n", ChatColor.GRAY, ChatColor.WHITE) +
String.format("%sHelp Command: %s/hs %shelp", ChatColor.GRAY, ChatColor.AQUA, ChatColor.WHITE)
);
diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
index 7be1ed6..dc8cab1 100644
--- a/src/main/resources/plugin.yml
+++ b/src/main/resources/plugin.yml
@@ -1,6 +1,6 @@
name: KenshinsHideAndSeek
main: net.tylermurphy.hideAndSeek.Main
-version: 1.7.3
+version: 1.7.4
author: KenshinEto
load: STARTUP
api-version: 1.13