From 1128923b1d61159bf6a342cc21bc572aa1adc2d5 Mon Sep 17 00:00:00 2001 From: Ryan Barlow <7389646+ryanbarlow97@users.noreply.github.com> Date: Thu, 15 Oct 2026 15:31:12 +0000 Subject: [PATCH] Reset formatting between the two halves of the collection line Co-Authored-By: Claude Opus 5.5 --- .../geigercounters/handlers/SourceHandler.java | 4 +++- .../geigercounters/handlers/SourceHandlerTest.java | 11 ++++++++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/src/main/java/net/tfminecraft/geigercounters/handlers/SourceHandler.java b/src/main/java/net/tfminecraft/geigercounters/handlers/SourceHandler.java index 58600b6..cdc99e1 100644 --- a/src/main/java/net/tfminecraft/geigercounters/handlers/SourceHandler.java +++ b/src/main/java/net/tfminecraft/geigercounters/handlers/SourceHandler.java @@ -2,6 +2,7 @@ import net.tfminecraft.tlibs.objects.api.ItemAPI; import org.bukkit.Bukkit; +import org.bukkit.ChatColor; import org.bukkit.Chunk; import org.bukkit.Location; import org.bukkit.Sound; @@ -311,6 +312,7 @@ private void collectSource(Player player, UUID hunter, Location collected, Equip } // One line: the find, then the spent counter. A blank half is left out. + // A reset between them stops the first half's colour and format carrying over. private void notifyPlayerOfCollection(Player player) { String found = config.getMessages().get("player.found-source"); String spent = config.getMessages().get("player.dead-geiger"); @@ -321,7 +323,7 @@ private void notifyPlayerOfCollection(Player player) { } return; } - player.sendMessage(found + " " + spent); + player.sendMessage(found + " " + ChatColor.RESET + spent); } private void replaceGeigerWithDeadVersion(Player player, EquipmentSlot geigerSlot) { diff --git a/src/test/java/net/tfminecraft/geigercounters/handlers/SourceHandlerTest.java b/src/test/java/net/tfminecraft/geigercounters/handlers/SourceHandlerTest.java index 4723105..36b2fed 100644 --- a/src/test/java/net/tfminecraft/geigercounters/handlers/SourceHandlerTest.java +++ b/src/test/java/net/tfminecraft/geigercounters/handlers/SourceHandlerTest.java @@ -367,10 +367,19 @@ void collectionSendsTheFindAndTheSpentCounterAsOneLine() { when(messages.get("player.dead-geiger")).thenReturn("Spent."); place(); collect(EquipmentSlot.HAND); - verify(player).sendMessage("Found! Spent."); + verify(player).sendMessage("Found! \u00a7rSpent."); verify(player, times(1)).sendMessage(anyString()); } + @Test + void theFirstHalfsFormattingDoesNotCarryIntoTheSecond() { + when(messages.get("player.found-source")).thenReturn("\u00a75\u00a7oFound!"); + when(messages.get("player.dead-geiger")).thenReturn("\u00a7lSpent."); + place(); + collect(EquipmentSlot.HAND); + verify(player).sendMessage("\u00a75\u00a7oFound! \u00a7r\u00a7lSpent."); + } + @Test void aBlankHalfOfTheCollectionLineIsLeftOut() { when(messages.get("player.found-source")).thenReturn("Found!", " ", "");