Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
import org.bukkit.event.player.PlayerRespawnEvent;

import net.tfminecraft.rpcharacters.objects.RPCharacter;
import net.tfminecraft.rpcharacters.permadeath.PermadeathService;
import net.tfminecraft.tlibs.character.CharacterSessionStartEvent;

public final class NutritionLifecycleListener implements Listener {
Expand Down Expand Up @@ -67,6 +68,11 @@ public void onPlayerDeath(PlayerDeathEvent event) {
return;
}
RPCharacter character = context.character();
// Administrative permakill activates the successor before the delayed body death.
if (PermadeathService.isAwaitingPermakillRespawn(player)) {
NutritionLog.append("DEATH", player, character, "action=skip cause=permakill-respawn");
return;
}
boolean inBattle = BattleFoodGate.inStartedBattle(player);
if (!context.isCurrent()) {
NutritionLog.append("DEATH", player, character, "action=skip cause=character-ended");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
import net.tfminecraft.rpcharacters.RPCharacters;
import net.tfminecraft.rpcharacters.managers.PlayerManager;
import net.tfminecraft.rpcharacters.objects.RPCharacter;
import net.tfminecraft.rpcharacters.permadeath.PermadeathService;
import net.tfminecraft.simplefactions.war.battle.engine.core.Battle;
import net.tfminecraft.simplefactions.war.battle.engine.core.BattleManager;
import net.tfminecraft.simplefactions.war.battle.engine.core.BattleSide;
Expand Down Expand Up @@ -154,8 +155,8 @@

@Test void saturationGuardsHandleFoodEventsAndOnePeriodicTask() {
SaturationGuard guard=new SaturationGuard();
guard.onFoodLevelChange(new FoodLevelChangeEvent(mock(HumanEntity.class),4));

Check warning on line 158 in src/test/java/net/tfminecraft/cooking/nutrition/NutritionListenersCoverageTest.java

View workflow job for this annotation

GitHub Actions / build

FoodLevelChangeEvent(org.bukkit.entity.HumanEntity,int) in org.bukkit.event.entity.FoodLevelChangeEvent has been deprecated and marked for removal
player.setSaturation(4); guard.onFoodLevelChange(new FoodLevelChangeEvent(player,4));

Check warning on line 159 in src/test/java/net/tfminecraft/cooking/nutrition/NutritionListenersCoverageTest.java

View workflow job for this annotation

GitHub Actions / build

FoodLevelChangeEvent(org.bukkit.entity.HumanEntity,int) in org.bukkit.event.entity.FoodLevelChangeEvent has been deprecated and marked for removal
assertEquals(4,player.getSaturation()); server.getScheduler().performOneTick(); assertEquals(0,player.getSaturation());
SaturationGuard.stop(); SaturationGuard.start(); SaturationGuard.start();
player.setSaturation(5); server.getScheduler().performTicks(40); assertEquals(0,player.getSaturation());
Expand Down Expand Up @@ -405,6 +406,45 @@
assertEquals(15, character.getFoodValue()); verifyNoInteractions(players);
}

@ParameterizedTest
@ValueSource(ints = {199, 200})
void commandPermakillDelayedDeathPreservesSuccessorFood(int successorFood) {
Plugin plugin = MockBukkit.createMockPlugin("RPCharacters");
character.setFoodValue(119);
RPCharacter successor = new RPCharacter(player);
successor.setFoodValue(successorFood);
NutritionLifecycleListener listener = new NutritionLifecycleListener();
PlayerDeathEvent death = mock(PlayerDeathEvent.class);
when(death.getEntity()).thenReturn(player);

// Administrative permakill activates the successor before scheduling the body's death.
rp.when(() -> RPCharacters.getActiveCharacter(player)).thenReturn(successor);
characters.activate(player, successor.getId());
PermadeathService.markPendingPermakillSounds(player);
try {
server.getScheduler().runTask(plugin, () -> die(listener, death));
server.getScheduler().performOneTick();

assertEquals(119, character.getFoodValue());
assertEquals(successorFood, successor.getFoodValue());
verifyNoInteractions(players);

// RPCharacters consumes this flag on respawn; later ordinary deaths still reset food.
assertTrue(PermadeathService.consumePendingPermakillSounds(player));
PlayerRespawnEvent respawn = mock(PlayerRespawnEvent.class);
when(respawn.getPlayer()).thenReturn(player);
player.setFoodLevel(8);
listener.onPlayerRespawn(respawn);
assertEquals(successorFood, successor.getFoodValue());
assertEquals(20, player.getFoodLevel());
die(listener, death);
assertEquals(80, successor.getFoodValue());
verify(players).savePlayer(player);
} finally {
PermadeathService.clearPendingPermadeathRespawn(player);
}
}

private static void die(NutritionLifecycleListener listener, PlayerDeathEvent death) {
listener.captureDeath(death); listener.onPlayerDeath(death);
}
Expand Down
Loading