Altitude/ctf
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: Altitude:237cae37ca3838a8483a1787f7fb5b6e0a6192bb
Branches Tags
Altitude:master
..
compare: Altitude:4cfc8f1572c68111f14d85a801fc85b33553e414
Branches Tags
Altitude:master

No commits in common. "237cae37ca3838a8483a1787f7fb5b6e0a6192bb" and "4cfc8f1572c68111f14d85a801fc85b33553e414" have entirely different histories.
237cae37ca ... 4cfc8f1572

3 changed files with 36 additions and 43 deletions
Show Stats Expand all files Collapse all files

73
src/main/java/com/alttd/ctf/flag/Flag.java
View File

@ -81,9 +81,15 @@ public class Flag implements Runnable {
//TODO add de-buffs and enable buffs for others?
player.getInventory().setItem(EquipmentSlot.HEAD, flagItem);
Bukkit.getScheduler().runTask(main, () -> flagLocation.getBlock().setType(Material.AIR));
notifyAboutCapture();
Bukkit.broadcast(MiniMessage.miniMessage().deserialize("<green><player> from <team> captured the flag!", TagResolver.resolver(
Placeholder.component("player", player.displayName()),
Placeholder.component("team", teamPlayer.getTeam().getName())
)));
flagCarrier = player;
resetFlag();
teamFlagPointCount.clear();
winningTeam = null;
lastWinningTeamId = -1;
bossBar.setProgress(0);
}
public void spawnFlag() {
@ -140,38 +146,24 @@ public class Flag implements Runnable {
updateDisplay();
} else {
winningTeam = optionalTeam.get();
resetFlag();
bossBar.setVisible(false);
bossBar.setProgress(0);
//TODO stop capture and let ppl know they can now capture the flag
}
}
private void notifyAboutCapture() {
Bukkit.broadcast(miniMessage.deserialize("<player> is carrying the flag for <team>!",
Placeholder.component("player", flagCarrier.displayName()),
Placeholder.component("team", winningTeam.getName())));
Title capturingTeamTitle = Title.title(miniMessage.deserialize("<green><team> obtained the flag!</green>",
Placeholder.component("team", winningTeam.getName())),
miniMessage.deserialize("<green>protect <player> while they bring it to your base.</green>",
Placeholder.component("player", flagCarrier.displayName())));
Title huntingTeamTitle = Title.title(miniMessage.deserialize("<red><team> obtained the flag!</red>",
Placeholder.component("team", winningTeam.getName())),
miniMessage.deserialize("<red>kill <player> before they bring it to their base.</red>",
Placeholder.component("player", flagCarrier.displayName())));
Bukkit.getOnlinePlayers().forEach(player ->
gameManager.getTeam(player.getUniqueId()).ifPresent(team ->
player.showTitle(team.getId() == winningTeam.getId() ? capturingTeamTitle : huntingTeamTitle)));
}
private void spawnParticlesOnSquareBorder(Location center, double size) {
double step = 0.2;
World world = center.getWorld();
Location finalCenter = center.clone().add(0, 0.5, 0);
Bukkit.getScheduler().runTask(main, () -> {
// Top and Bottom (Z varies, X constant)
for (double z = -size; z <= size; z += step) {
world.spawnParticle(Particle.FLAME, finalCenter.getX() + size, finalCenter.getY(), finalCenter.getZ() + z, 1, 0, 0, 0, 0);
world.spawnParticle(Particle.FLAME, finalCenter.getX() - size, finalCenter.getY(), finalCenter.getZ() + z, 1, 0, 0, 0, 0);
}
// Left and Right (X varies, Z constant)
for (double x = -size; x <= size; x += step) {
world.spawnParticle(Particle.FLAME, finalCenter.getX() + x, finalCenter.getY(), finalCenter.getZ() + size, 1, 0, 0, 0, 0);
world.spawnParticle(Particle.FLAME, finalCenter.getX() + x, finalCenter.getY(), finalCenter.getZ() - size, 1, 0, 0, 0, 0);
@ -192,7 +184,8 @@ public class Flag implements Runnable {
private void checkFlagCarrier() {
if (flagCarrier.isDead() || !flagCarrier.isOnline()) {
resetFlagCarrier();
flagCarrier = null;
particleTrail.clear();
spawnFlag();
return;
}
@ -205,7 +198,7 @@ public class Flag implements Runnable {
spawnParticlesOnSquareBorder(winningTeam.getFlagTurnInLocation(), GameConfig.FLAG.TURN_IN_RADIUS);
return;
}
notifyAboutTurnIn();
notifyAboutCapture();
spawnFlag();
wins.merge(winningTeam.getId(), 1, Integer::sum);
winningTeam = null;
@ -217,18 +210,25 @@ public class Flag implements Runnable {
teamPlayer.getGameClass().setArmor(flagCarrier, teamPlayer);
flagCarrier.getInventory().setItem(EquipmentSlot.HEAD, null);
}
resetFlagCarrier();
flagCarrier = null;
particleTrail.clear();
}
private void notifyAboutTurnIn() {
private void notifyAboutCapture() {
Bukkit.broadcast(miniMessage.deserialize("<player> captured the flag for <team>!",
Placeholder.component("player", flagCarrier.displayName()),
Placeholder.component("team", winningTeam.getName())));
Title title = Title.title(miniMessage.deserialize("<green><player> captured the flag for team <team>!</green>",
Title capturingTeamTitle = Title.title(miniMessage.deserialize("<green><team> captured the flag!</green>",
Placeholder.component("team", winningTeam.getName())),
miniMessage.deserialize("<green>protect <player> while they bring it to your base.</green>",
Placeholder.component("player", flagCarrier.displayName())));
Bukkit.getOnlinePlayers().forEach(player -> player.showTitle(title));
Title huntingTeamTitle = Title.title(miniMessage.deserialize("<red><team> captured the flag!</red>",
Placeholder.component("team", winningTeam.getName())),
miniMessage.deserialize("<red>kill <player> before they bring it to their base.</red>",
Placeholder.component("player", flagCarrier.displayName())));
Bukkit.getOnlinePlayers().forEach(player ->
gameManager.getTeam(player.getUniqueId()).ifPresent(team ->
player.showTitle(team.getId() == winningTeam.getId() ? capturingTeamTitle : huntingTeamTitle)));
}
private Optional<Team> winnerExists() {
@ -349,23 +349,15 @@ public class Flag implements Runnable {
return winsByTeam;
}
public void resetFlagCarrier() {
flagCarrier = null;
winningTeam = null;
particleTrail.clear();
}
public void resetFlag() {
public void reset() {
bossBar.setVisible(false);
teamFlagPointCount.clear();
bossBar.setProgress(0);
lastWinningTeamId = -1;
}
public void resetAll() {
resetFlagCarrier();
resetFlag();
winningTeam = null;
flagCarrier = null;
particleTrail.clear();
wins.clear();
lastWinningTeamId = -1;
}
public void handleCarrierDeathOrDisconnect(Player player) {
@ -375,7 +367,8 @@ public class Flag implements Runnable {
if (!flagCarrier.getUniqueId().equals(player.getUniqueId())) {
return;
}
resetFlagCarrier();
flagCarrier = null;
particleTrail.clear();
spawnFlag();
gameManager.getTeam(player.getUniqueId())
.ifPresentOrElse(team -> Bukkit.broadcast(MiniMessage.miniMessage()

2
src/main/java/com/alttd/ctf/game/phases/EndedPhase.java
View File

@ -50,7 +50,7 @@ public class EndedPhase implements GamePhaseExecutor {
maxHealthAttribute.setBaseValue(20);
player.setHealth(20);
});
flag.resetAll();
flag.reset();
}).start();
// TODO reset world (coreprotect) to prep for next round
}

4
version.properties
View File

@ -1,3 +1,3 @@
#Tue Feb 11 22:04:16 CET 2025
buildNumber=42
#Tue Feb 11 21:46:26 CET 2025
buildNumber=39
version=0.1