aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/main/java/at/hannibal2/skyhanni/data/TitleManager.kt4
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/fishing/SeaCreatureFeatures.kt4
2 files changed, 5 insertions, 3 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/data/TitleManager.kt b/src/main/java/at/hannibal2/skyhanni/data/TitleManager.kt
index 383600ff9..5b8bbd2b8 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/TitleManager.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/TitleManager.kt
@@ -29,14 +29,14 @@ class TitleManager {
fun command(args: Array<String>) {
if (args.size < 4) {
- LorenzUtils.userError("Specify title text to test")
+ LorenzUtils.userError("Usage: /shsendtitle <duration> <height> <fontSize> <text ..>")
return
}
val duration = args[0].toInt().seconds
val height = args[1].toDouble()
val fontSize = args[2].toDouble()
- val title = "§6" + args.drop(3).joinToString(" ")
+ val title = "§6" + args.drop(3).joinToString(" ").replace("&", "§")
sendTitle(title, duration, height, fontSize)
}
diff --git a/src/main/java/at/hannibal2/skyhanni/features/fishing/SeaCreatureFeatures.kt b/src/main/java/at/hannibal2/skyhanni/features/fishing/SeaCreatureFeatures.kt
index cdb990afe..8df5ed2d5 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/fishing/SeaCreatureFeatures.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/fishing/SeaCreatureFeatures.kt
@@ -52,7 +52,9 @@ class SeaCreatureFeatures {
{ config.highlight }
RenderLivingEntityHelper.setNoHurtTime(entity) { config.highlight }
- if (creatureType == RareSeaCreatureType.WATER_HYDRA && entity.health == (entity.baseMaxHealth.toFloat() / 2)) continue; // Water hydra splitting in two
+ // Water hydra splitting in two
+ if (creatureType == RareSeaCreatureType.WATER_HYDRA && entity.health == (entity.baseMaxHealth.toFloat() / 2)) continue
+
if (config.alertOtherCatches && lastRareCatch.passedSince() > 1.seconds) {
val creature = SeaCreatureManager.allFishingMobs[creatureType.nametag]
TitleManager.sendTitle("${creature?.rarity?.chatColorCode ?: "§6"}RARE SEA CREATURE!", 1.5.seconds, 3.6, 7.0)