update dependicies, fix worldborder, fix timer when player leaves, fix drop items
This commit is contained in:
parent
7ad63246f3
commit
9626697c8f
4 changed files with 11 additions and 7 deletions
10
pom.xml
10
pom.xml
|
@ -111,7 +111,7 @@
|
|||
<dependency>
|
||||
<groupId>org.xerial</groupId>
|
||||
<artifactId>sqlite-jdbc</artifactId>
|
||||
<version>3.39.3.0</version>
|
||||
<version>3.40.1.0</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.jetbrains</groupId>
|
||||
|
@ -121,23 +121,23 @@
|
|||
<dependency>
|
||||
<groupId>com.github.cryptomorin</groupId>
|
||||
<artifactId>XSeries</artifactId>
|
||||
<version>9.1.0</version>
|
||||
<version>9.2.0</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>me.clip</groupId>
|
||||
<artifactId>placeholderapi</artifactId>
|
||||
<version>2.11.1</version>
|
||||
<version>2.11.2</version>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.zaxxer</groupId>
|
||||
<artifactId>HikariCP</artifactId>
|
||||
<version>5.0.1</version>
|
||||
<version>4.0.3</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.mariadb.jdbc</groupId>
|
||||
<artifactId>mariadb-java-client</artifactId>
|
||||
<version>3.0.6</version>
|
||||
<version>3.1.2</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
</project>
|
|
@ -36,7 +36,7 @@ public class Border implements ICommand {
|
|||
addToConfig("worldBorder.enabled",false);
|
||||
saveConfig();
|
||||
sender.sendMessage(messagePrefix + message("WORLDBORDER_DISABLE"));
|
||||
Main.getInstance().getGame().getCurrentMap().getWorldBorder().resetWorldBorder();
|
||||
map.getWorldBorder().resetWorldBorder();
|
||||
return;
|
||||
}
|
||||
int num,delay,change;
|
||||
|
|
|
@ -242,6 +242,9 @@ public class Game {
|
|||
}
|
||||
} else {
|
||||
lobbyTimer = -1;
|
||||
if (gameTick % 20 == 0) {
|
||||
board.reloadLobbyBoards();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -49,6 +49,7 @@ public class PlayerHandler implements Listener {
|
|||
if(Main.getInstance().getGame().getStatus() == Status.STANDBY) return;
|
||||
ItemStack item = event.getEntity().getItemStack();
|
||||
if (!Items.matchItem(item)) return;
|
||||
if (dropItems) return;
|
||||
event.setCancelled(true);
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue