trueog/nexia-events
2
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Activity

splurger making things complicated

Browse Source
This commit is contained in:
Infinityy committed 2024-07-08 19:10:08 +02:00
1 parent 26bd6ed2f4
commit a0e5f16e6a
2 files changed
+19 -7
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/com/nexia/teams/NexiaTeams.java
+10 -2
View File
@@ -48,8 +48,16 @@ public class NexiaTeams implements ModInitializer {
ServerLivingEntityEvents.AFTER_DEATH.register(((entity, damageSource) -> {
if (entity instanceof ServerPlayer) {
if (TournamentFight.isRunning && (entity.getTeam() == TournamentFight.blueTeam || entity.getTeam() == TournamentFight.redTeam)) {
TournamentFight.end();
if (TournamentFight.isRunning) {
if (entity.getTeam() == TournamentFight.blueTeam) {
entity.removeTag("blue");
if (ServerTime.minecraftServer.overworld().getPlayers(o -> o.getTags().contains("blue")).isEmpty()) TournamentFight.end();
}
if (entity.getTeam() == TournamentFight.redTeam) {
entity.removeTag("red");
if (ServerTime.minecraftServer.overworld().getPlayers(o -> o.getTags().contains("red")).isEmpty()) TournamentFight.end();
}
}
}
}));
src/main/java/com/nexia/teams/events/tournament/TournamentFight.java
+9 -5
View File
@@ -87,15 +87,19 @@ public abstract class TournamentFight {
for (String playerName : redTeam.getPlayers()) {
ServerPlayer serverPlayer = ServerTime.minecraftServer.getPlayerList().getPlayerByName(playerName);
if (serverPlayer == null) continue;
serverPlayers.add(serverPlayer);
serverPlayer.teleportTo(ServerTime.minecraftServer.overworld(), redSpawn[0], redSpawn[1], redSpawn[2], 90, 0);
if (serverPlayer.getTags().contains("red")) {
serverPlayers.add(serverPlayer);
serverPlayer.teleportTo(ServerTime.minecraftServer.overworld(), redSpawn[0], redSpawn[1], redSpawn[2], 90, 0);
}
}
for (String playerName : blueTeam.getPlayers()) {
ServerPlayer serverPlayer = ServerTime.minecraftServer.getPlayerList().getPlayerByName(playerName);
if (serverPlayer == null) continue;
serverPlayers.add(serverPlayer);
serverPlayer.teleportTo(ServerTime.minecraftServer.overworld(), blueSpawn[0], blueSpawn[1], blueSpawn[2], -90, 0);
if (serverPlayer.getTags().contains("blue")) {
serverPlayers.add(serverPlayer);
serverPlayer.teleportTo(ServerTime.minecraftServer.overworld(), blueSpawn[0], blueSpawn[1], blueSpawn[2], -90, 0);
}
}
}
@@ -149,7 +153,7 @@ public abstract class TournamentFight {
if (isRunning || isStarting) {
for (Player player : ServerTime.minecraftServer.overworld().getEntities(EntityType.PLAYER, spawnArea, o -> true)) {
if (player.getTeam() != blueTeam && player.getTeam() != redTeam) player.teleportTo(redSpawn[0], 70, redSpawn[2]);
if (!player.getTags().contains("blue") && !player.getTags().contains("red")) player.teleportTo(redSpawn[0], 70, redSpawn[2]);
}
}
}