Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/dev' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
database-test committed Oct 27, 2024
2 parents dc267ef + ec970ae commit fc8512b
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 0 deletions.
3 changes: 3 additions & 0 deletions src/main/java/com/nexia/base/player/PlayerDataManager.java
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,9 @@ public static void init() {

// <----------- SkyWars --------------->
new PlayerDataManager(NexiaCore.SKYWARS_DATA_MANAGER, "skywars", WLKSavedPlayerData.class, SkywarsPlayerData.class);

// <----------- Bridge --------------->
new PlayerDataManager(NexiaCore.BRIDGE_DATA_MANAGER, "bridge", WLKSavedPlayerData.class, BridgePlayerData.class);
}

public PlayerData get(NexiaPlayer player) {
Expand Down
3 changes: 3 additions & 0 deletions src/main/java/com/nexia/core/utilities/time/ServerTime.java
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ public static void firstTick(MinecraftServer server) {

SkywarsGame.firstTick();
OitcGame.firstTick();
BridgeGame.firstTick();
DuelGameHandler.starting();
}

Expand Down Expand Up @@ -106,6 +107,7 @@ public static void everyTick() {
FootballGame.tick();
BridgeGame.tick();
OitcGame.tick();
BridgeGame.tick();

if (totalTickCount % 5 == 0) {
FfaClassicUtil.INSTANCE.fiveTick();
Expand All @@ -132,6 +134,7 @@ static void everySecond() {
FootballGame.second();
BridgeGame.second();
SkywarsGame.second();
BridgeGame.second();
try {
for (DuelsGame game : DuelGameHandler.duelsGames) {
if (game == null) return;
Expand Down

0 comments on commit fc8512b

Please sign in to comment.