aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCow <cow@volloeko.de>2020-12-21 19:34:50 +0100
committerCow <cow@volloeko.de>2020-12-21 19:34:50 +0100
commit50fe638726f9f684004365bb99c3117acead8cd0 (patch)
tree90b8213e2b7459532778cc88ca0f68489d824429 /src
parent1f58cab966b15f12f4dd979f48e047c936c5841a (diff)
downloadCowlection-50fe638726f9f684004365bb99c3117acead8cd0.tar.gz
Cowlection-50fe638726f9f684004365bb99c3117acead8cd0.tar.bz2
Cowlection-50fe638726f9f684004365bb99c3117acead8cd0.zip
Removed obsolete dungeons detection code
Diffstat (limited to 'src')
-rw-r--r--src/main/java/de/cowtipper/cowlection/command/MooCommand.java2
-rw-r--r--src/main/java/de/cowtipper/cowlection/listener/PlayerListener.java2
-rw-r--r--src/main/java/de/cowtipper/cowlection/listener/skyblock/DungeonsListener.java27
3 files changed, 2 insertions, 29 deletions
diff --git a/src/main/java/de/cowtipper/cowlection/command/MooCommand.java b/src/main/java/de/cowtipper/cowlection/command/MooCommand.java
index 51a14fe..cf6b388 100644
--- a/src/main/java/de/cowtipper/cowlection/command/MooCommand.java
+++ b/src/main/java/de/cowtipper/cowlection/command/MooCommand.java
@@ -150,7 +150,7 @@ public class MooCommand extends CommandBase {
minutes -= hours * 60;
main.getChatHelper().sendMessage(EnumChatFormatting.YELLOW, msgPrefix + " loaded around " + EnumChatFormatting.GOLD + days + " ingame days "
- + EnumChatFormatting.YELLOW + "(= less than " + EnumChatFormatting.GOLD + (hours > 0 ? hours + " hours " : "") + (minutes > 0 ? minutes + " mins " : "") + ")");
+ + EnumChatFormatting.YELLOW + "(= less than" + EnumChatFormatting.GOLD + (hours > 0 ? " " + hours + " hours" : "") + (minutes > 0 ? " " + minutes + " mins" : "") + ")");
}, 20);
}
//endregion
diff --git a/src/main/java/de/cowtipper/cowlection/listener/PlayerListener.java b/src/main/java/de/cowtipper/cowlection/listener/PlayerListener.java
index a6f3660..484b5b7 100644
--- a/src/main/java/de/cowtipper/cowlection/listener/PlayerListener.java
+++ b/src/main/java/de/cowtipper/cowlection/listener/PlayerListener.java
@@ -220,7 +220,7 @@ public class PlayerListener {
minutes -= hours * 60;
main.getChatHelper().sendMessage(new MooChatComponent("⚠ ").darkGreen()
.appendSibling(new MooChatComponent("This world is " + infix + "loaded around " + EnumChatFormatting.DARK_GREEN + days + " ingame days.").green()
- .setHover(new MooChatComponent("= less than " + EnumChatFormatting.DARK_GREEN + (hours > 0 ? hours + " hours " : "") + (minutes > 0 ? minutes + " mins " : "")).green())));
+ .setHover(new MooChatComponent("= less than" + EnumChatFormatting.DARK_GREEN + (hours > 0 ? " " + hours + " hours" : "") + (minutes > 0 ? " " + minutes + " mins" : "")).green())));
} else if (MooConfig.notifyOldServer > 0 && days > MooConfig.notifyOldServer) {
// old server
main.getChatHelper().sendMessage(new MooChatComponent("⚠ ").red()
diff --git a/src/main/java/de/cowtipper/cowlection/listener/skyblock/DungeonsListener.java b/src/main/java/de/cowtipper/cowlection/listener/skyblock/DungeonsListener.java
index 998102d..f1fdf74 100644
--- a/src/main/java/de/cowtipper/cowlection/listener/skyblock/DungeonsListener.java
+++ b/src/main/java/de/cowtipper/cowlection/listener/skyblock/DungeonsListener.java
@@ -426,33 +426,6 @@ public class DungeonsListener {
}
// Events inside dungeons
- @SubscribeEvent
- public void onDungeonsEnterOrLeave(PlayerSetSpawnEvent e) {
- // check if player has entered or left a SkyBlock dungeon
- new TickDelay(() -> {
- Scoreboard scoreboard = e.entityPlayer.worldObj.getScoreboard();
- ScoreObjective scoreboardSidebar = scoreboard.getObjectiveInDisplaySlot(1);
- if (scoreboardSidebar == null) {
- return;
- }
-
- Collection<Score> scoreboardLines = scoreboard.getSortedScores(scoreboardSidebar);
- for (Score line : scoreboardLines) {
- ScorePlayerTeam scorePlayerTeam = scoreboard.getPlayersTeam(line.getPlayerName());
- if (scorePlayerTeam != null) {
- String lineWithoutFormatting = EnumChatFormatting.getTextWithoutFormattingCodes(scorePlayerTeam.getColorPrefix() + scorePlayerTeam.getColorSuffix());
-
- if (lineWithoutFormatting.startsWith(" ⏣")) {
- // current location: dungeon or outside?
- boolean isInDungeonNow = lineWithoutFormatting.startsWith(" ⏣ The Catacombs");
- main.getDungeonCache().onDungeonEnterOrLeave(isInDungeonNow);
- return;
- }
- }
- }
- }, 40); // 2 second delay, making sure scoreboard got sent
- }
-
// priority = highest to ignore other mods modifying the chat output
@SubscribeEvent(priority = EventPriority.HIGHEST, receiveCanceled = true)
public void onMessageReceived(ClientChatReceivedEvent e) {