Fix: don't track kills from yourself, add exclude_self flag to on_dea…

…th trigger
LoveTropics · Nov 18, 2024 · 74f2a7d · 74f2a7d
1 parent 48a1602
commit 74f2a7d
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 6 deletions.
diff --git a/...ropics/minigames/common/core/game/behavior/instances/statistics/KillsTrackerBehavior.java b/...ropics/minigames/common/core/game/behavior/instances/statistics/KillsTrackerBehavior.java
@@ -27,11 +27,13 @@ public void register(IGamePhase game, EventRegistrar events) {
 
 			final ServerPlayer killerPlayer = Util.getKillerPlayer(player, damageSource);
 			if (killerPlayer != null) {
-				statistics.forPlayer(killerPlayer).incrementInt(StatisticKey.KILLS, 1);
+				if (killerPlayer != player) {
+					statistics.forPlayer(killerPlayer).incrementInt(StatisticKey.KILLS, 1);
 
-				GameTeamKey team = teams != null ? teams.getTeamForPlayer(killerPlayer) : null;
-				if (team != null) {
-					statistics.forTeam(team).incrementInt(StatisticKey.KILLS, 1);
+					GameTeamKey team = teams != null ? teams.getTeamForPlayer(killerPlayer) : null;
+					if (team != null) {
+						statistics.forTeam(team).incrementInt(StatisticKey.KILLS, 1);
+					}
 				}
 
 				playerStatistics.set(StatisticKey.KILLED_BY, PlayerKey.from(killerPlayer));

diff --git a/...com/lovetropics/minigames/common/core/game/behavior/instances/trigger/OnDeathTrigger.java b/...com/lovetropics/minigames/common/core/game/behavior/instances/trigger/OnDeathTrigger.java
@@ -10,6 +10,7 @@
 import com.lovetropics.minigames.common.core.game.behavior.event.EventRegistrar;
 import com.lovetropics.minigames.common.core.game.behavior.event.GamePlayerEvents;
 import com.lovetropics.minigames.common.util.Util;
+import com.mojang.serialization.Codec;
 import com.mojang.serialization.MapCodec;
 import com.mojang.serialization.codecs.RecordCodecBuilder;
 import net.minecraft.advancements.critereon.EntityPredicate;
@@ -19,12 +20,13 @@
 import java.util.Optional;
 import java.util.function.Supplier;
 
-public record OnDeathTrigger(GameActionList<ServerPlayer> killedAction, GameActionList<ServerPlayer> killerAction, Optional<EntityPredicate> killedPredicate, Optional<EntityPredicate> killerPredicate) implements IGameBehavior {
+public record OnDeathTrigger(GameActionList<ServerPlayer> killedAction, GameActionList<ServerPlayer> killerAction, Optional<EntityPredicate> killedPredicate, Optional<EntityPredicate> killerPredicate, boolean excludeSelf) implements IGameBehavior {
 	public static final MapCodec<OnDeathTrigger> CODEC = RecordCodecBuilder.mapCodec(i -> i.group(
 			GameActionList.PLAYER_CODEC.optionalFieldOf("killed_action", GameActionList.EMPTY).forGetter(OnDeathTrigger::killedAction),
 			GameActionList.PLAYER_CODEC.optionalFieldOf("killer_action", GameActionList.EMPTY).forGetter(OnDeathTrigger::killerAction),
 			EntityPredicate.CODEC.optionalFieldOf("killed_predicate").forGetter(OnDeathTrigger::killedPredicate),
-			EntityPredicate.CODEC.optionalFieldOf("killer_predicate").forGetter(OnDeathTrigger::killerPredicate)
+			EntityPredicate.CODEC.optionalFieldOf("killer_predicate").forGetter(OnDeathTrigger::killerPredicate),
+			Codec.BOOL.optionalFieldOf("exclude_self", false).forGetter(OnDeathTrigger::excludeSelf)
 	).apply(i, OnDeathTrigger::new));
 
 	@Override
@@ -34,6 +36,9 @@ public void register(IGamePhase game, EventRegistrar events) {
 
 		events.listen(GamePlayerEvents.DEATH, (player, damageSource) -> {
 			final ServerPlayer killer = Util.getKillerPlayer(player, damageSource);
+			if (excludeSelf && killer == player) {
+				return InteractionResult.PASS;
+			}
 			if (killerPredicate.isPresent() && !killerPredicate.get().matches(player, killer)) {
 				return InteractionResult.PASS;
 			}