From 8ab18f2053a0a903bf3d283c2111fc893d4decda Mon Sep 17 00:00:00 2001 From: bowser0000 Date: Mon, 2 Nov 2020 13:31:50 -0500 Subject: Add spooky fishing, fix fishing detection and bug fixes Minimize repetition by moving things to increaseSeaCreatures() Add Wither Skeleton to trivia question answer --- src/main/java/me/Danker/commands/DisplayCommand.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'src/main/java/me/Danker/commands/DisplayCommand.java') diff --git a/src/main/java/me/Danker/commands/DisplayCommand.java b/src/main/java/me/Danker/commands/DisplayCommand.java index b96ab2b..ee4422f 100644 --- a/src/main/java/me/Danker/commands/DisplayCommand.java +++ b/src/main/java/me/Danker/commands/DisplayCommand.java @@ -22,7 +22,7 @@ public class DisplayCommand extends CommandBase { @Override public String getCommandUsage(ICommandSender arg0) { - return "/" + getCommandName() + " [winter/festival/session/f(1-6)]"; + return "/" + getCommandName() + " [winter/festival/spooky/session/f(1-6)]"; } @Override @@ -35,7 +35,7 @@ public class DisplayCommand extends CommandBase { if (args.length == 1) { return getListOfStringsMatchingLastWord(args, "wolf", "spider", "zombie", "fishing", "catacombs", "auto", "off"); } else if (args.length == 2 && args[0].equalsIgnoreCase("fishing")) { - return getListOfStringsMatchingLastWord(args, "winter", "festival", "session"); + return getListOfStringsMatchingLastWord(args, "winter", "festival", "spooky", "session"); } else if (args.length == 2 && args[0].equalsIgnoreCase("catacombs")) { return getListOfStringsMatchingLastWord(args, "f1", "floor1", "f2", "floor2", "f3", "floor3", "f4", "floor4", "f5", "floor5", "f6", "floor6"); } else if (args.length > 1 || (args.length == 3 && args[0].equalsIgnoreCase("fishing") && args[1].equalsIgnoreCase("winter"))) { @@ -89,6 +89,12 @@ public class DisplayCommand extends CommandBase { } else { display = "fishing_festival"; } + } else if (arg1.length > 1 && arg1[1].equalsIgnoreCase("spooky")) { + if (showSession) { + display = "spooky_fishing_session"; + } else { + display = "spooky_fishing"; + } } else { if (showSession) { display = "fishing_session"; -- cgit