Skip to content

Remove obsolete pet and animal exclusion from wills #112

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ryanbarlow97 merged 1 commit into from
Oct 14, 2026
Merged

Remove obsolete pet and animal exclusion from wills #112

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 0 additions & 1 deletion src/main/java/net/tfminecraft/rpcharacters/will/WillMenu.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@ private static void main(Context ctx) {
List<String> held = estates == null ? List.of() : estates.holdings(UUID.fromString(ctx.character().getId()));
lines.add(held.isEmpty() ? "Your estate holds nothing recorded today." : "Your estate today:");
for (String line : held) lines.add("• " + line);
lines.add("Pets and animals are not included yet.");
List<Button> buttons = new ArrayList<>();
buttons.add(button(ctx, "Name an heir", values -> ask(ctx)));
if (will.named()) buttons.add(button(ctx, "Revoke", values -> confirm(ctx, null, "Revoke your will? Nobody will be named.")));
Expand Down
5 changes: 3 additions & 2 deletions src/test/java/net/tfminecraft/rpcharacters/will/WillMenuTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,13 +119,14 @@ private void click(String label) {
@Test
void namingAnHeirByNameConfirmsAndSaves() {
EstateHooks hooks = mock(EstateHooks.class);
when(hooks.holdings(UUID.fromString(aria.getId()))).thenReturn(List.of("340.25 in pouch and bank"));
when(hooks.holdings(UUID.fromString(aria.getId()))).thenReturn(List.of("340.25 in pouch and bank", "2 pets", "1 animal"));
estates.when(EstateLink::current).thenReturn(hooks);
WillMenu.open(player);
assertEquals("Will of Aria", last().title());
assertTrue(last().lines().contains("No heir is named."));
assertTrue(last().lines().contains("• 340.25 in pouch and bank"));
assertTrue(last().lines().contains("Pets and animals are not included yet."));
assertTrue(last().lines().contains("• 2 pets"));
assertTrue(last().lines().contains("• 1 animal"));
assertEquals(List.of("Name an heir", "Close"), last().buttons().stream().map(Button::label).toList());
click("Name an heir");
assertEquals("heir", last().input().key());
Expand Down
Loading