Clear kill tracker after dying in Dodgeball

LoveTropics · Nov 17, 2024 · 9ef7dcb · 9ef7dcb
1 parent c8e6aac
commit 9ef7dcb
Showing 1 changed file with 11 additions and 2 deletions.
diff --git a/...m/lovetropics/minigames/common/core/game/behavior/instances/ImmediateRespawnBehavior.java b/...m/lovetropics/minigames/common/core/game/behavior/instances/ImmediateRespawnBehavior.java
@@ -25,14 +25,15 @@
 import java.util.Map;
 import java.util.Optional;
 
-public record ImmediateRespawnBehavior(Optional<PlayerRole> role, Optional<PlayerRole> respawnAsRole, Optional<TemplatedText> deathMessage, boolean dropInventory, GameActionList<ServerPlayer> respawnAction, boolean spectateKiller) implements IGameBehavior {
+public record ImmediateRespawnBehavior(Optional<PlayerRole> role, Optional<PlayerRole> respawnAsRole, Optional<TemplatedText> deathMessage, boolean dropInventory, GameActionList<ServerPlayer> respawnAction, boolean spectateKiller, boolean clearKillTracker) implements IGameBehavior {
 	public static final MapCodec<ImmediateRespawnBehavior> CODEC = RecordCodecBuilder.mapCodec(i -> i.group(
 			PlayerRole.CODEC.optionalFieldOf("role").forGetter(c -> c.role),
 			PlayerRole.CODEC.optionalFieldOf("respawn_as").forGetter(c -> c.respawnAsRole),
 			TemplatedText.CODEC.optionalFieldOf("death_message").forGetter(c -> c.deathMessage),
 			Codec.BOOL.optionalFieldOf("drop_inventory", false).forGetter(c -> c.dropInventory),
 			GameActionList.PLAYER_CODEC.optionalFieldOf("respawn_action", GameActionList.EMPTY).forGetter(c -> c.respawnAction),
-			Codec.BOOL.optionalFieldOf("spectate_killer", true).forGetter(c -> c.spectateKiller)
+			Codec.BOOL.optionalFieldOf("spectate_killer", true).forGetter(c -> c.spectateKiller),
+			Codec.BOOL.optionalFieldOf("clear_kill_tracker", false).forGetter(c -> c.clearKillTracker)
 	).apply(i, ImmediateRespawnBehavior::new));
 
 	@Override
@@ -76,6 +77,14 @@ private void respawnPlayer(IGamePhase game, ServerPlayer player, @Nullable Playe
 		player.fallDistance = 0.0f;
 
 		respawnAction.apply(game, GameActionContext.EMPTY, player);
+
+		if (clearKillTracker) {
+			for (ServerPlayer otherPlayer : game.participants()) {
+				if (otherPlayer.getKillCredit() == player) {
+					otherPlayer.setLastHurtByPlayer(null);
+				}
+			}
+		}
 	}
 
 	private void sendDeathMessage(IGamePhase game, ServerPlayer player) {