freya/kenshinshideandseek
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

update dependicies, fix worldborder, fix timer when player leaves, fix drop items

Browse source
This commit is contained in:
Tyler Murphy 2023-02-08 18:18:41 -05:00
parent 7ad63246f3
commit 9626697c8f
4 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
pom.xml
View file

@ -111,7 +111,7 @@
<dependency> <dependency>
<groupId>org.xerial</groupId> <groupId>org.xerial</groupId>
<artifactId>sqlite-jdbc</artifactId> <artifactId>sqlite-jdbc</artifactId>
<version>3.39.3.0</version> <version>3.40.1.0</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.jetbrains</groupId> <groupId>org.jetbrains</groupId>
@ -121,23 +121,23 @@
<dependency> <dependency>
<groupId>com.github.cryptomorin</groupId> <groupId>com.github.cryptomorin</groupId>
<artifactId>XSeries</artifactId> <artifactId>XSeries</artifactId>
<version>9.1.0</version> <version>9.2.0</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>me.clip</groupId> <groupId>me.clip</groupId>
<artifactId>placeholderapi</artifactId> <artifactId>placeholderapi</artifactId>
<version>2.11.1</version> <version>2.11.2</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.zaxxer</groupId> <groupId>com.zaxxer</groupId>
<artifactId>HikariCP</artifactId> <artifactId>HikariCP</artifactId>
<version>5.0.1</version> <version>4.0.3</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.mariadb.jdbc</groupId> <groupId>org.mariadb.jdbc</groupId>
<artifactId>mariadb-java-client</artifactId> <artifactId>mariadb-java-client</artifactId>
<version>3.0.6</version> <version>3.1.2</version>
</dependency> </dependency>
</dependencies> </dependencies>
</project> </project>

2
src/main/java/net/tylermurphy/hideAndSeek/command/map/set/Border.java
View file

@ -36,7 +36,7 @@ public class Border implements ICommand {
addToConfig("worldBorder.enabled",false); addToConfig("worldBorder.enabled",false);
saveConfig(); saveConfig();
sender.sendMessage(messagePrefix + message("WORLDBORDER_DISABLE")); sender.sendMessage(messagePrefix + message("WORLDBORDER_DISABLE"));
Main.getInstance().getGame().getCurrentMap().getWorldBorder().resetWorldBorder(); map.getWorldBorder().resetWorldBorder();
return; return;
} }
int num,delay,change; int num,delay,change;

3
src/main/java/net/tylermurphy/hideAndSeek/game/Game.java
View file

@ -242,6 +242,9 @@ public class Game {
} }
} else { } else {
lobbyTimer = -1; lobbyTimer = -1;
if (gameTick % 20 == 0) {
board.reloadLobbyBoards();
}
} }
} }

1
src/main/java/net/tylermurphy/hideAndSeek/game/listener/PlayerHandler.java
View file

@ -49,6 +49,7 @@ public class PlayerHandler implements Listener {
if(Main.getInstance().getGame().getStatus() == Status.STANDBY) return; if(Main.getInstance().getGame().getStatus() == Status.STANDBY) return;
ItemStack item = event.getEntity().getItemStack(); ItemStack item = event.getEntity().getItemStack();
if (!Items.matchItem(item)) return; if (!Items.matchItem(item)) return;
if (dropItems) return;
event.setCancelled(true); event.setCancelled(true);
} }