Skip to content

Commit 6e7e6fc

Browse files
committed
Update specialMayorCommand.js
1 parent add2b56 commit 6e7e6fc

File tree

1 file changed

+19
-16
lines changed

1 file changed

+19
-16
lines changed

src/minecraft/commands/specialMayorCommand.js

Lines changed: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,30 @@ const yearMs = yearLength * monthMs;
1818

1919
const yearZero = 1560275700000;
2020

21+
const currentSkyblockYear = timeToSkyblockYear(Date.now());
22+
23+
var yearsUntilSpecial = 0;
24+
var diffSkyblockYear = currentSkyblockYear;
25+
var specialMayor = "";
26+
2127

2228
function timeToSkyblockYear(time) {
2329
return Math.floor((time - yearZero) / yearMs) + 1;
2430
}
2531

32+
function getSpecialMayor(skyblockYear) {
33+
if (diffSkyblockYear % 24 == 8){
34+
specialMayor = "Derpy";
35+
} else if (diffSkyblockYear % 24 == 16){
36+
specialMayor = "Jerry";
37+
} else if (diffSkyblockYear % 24 == 0){
38+
specialMayor = "Scorpius";
39+
} else {
40+
specialMayor = "Error!";
41+
}
42+
return specialMayor;
43+
}
44+
2645
class SpecialMayorCommand extends minecraftCommand {
2746
constructor(minecraft) {
2847
super(minecraft);
@@ -35,22 +54,6 @@ class SpecialMayorCommand extends minecraftCommand {
3554

3655
async onCommand() {
3756
try {
38-
const currentSkyblockYear = timeToSkyblockYear(Date.now());
39-
var yearsUntilSpecial = 0;
40-
var diffSkyblockYear = currentSkyblockYear;
41-
var specialMayor = "";
42-
function getSpecialMayor(skyblockYear) {
43-
if (diffSkyblockYear % 24 == 8){
44-
specialMayor = "Derpy";
45-
} else if (diffSkyblockYear % 24 == 16){
46-
specialMayor = "Jerry";
47-
} else if (diffSkyblockYear % 24 == 0){
48-
specialMayor = "Scorpius";
49-
} else {
50-
specialMayor = "Error!";
51-
}
52-
return specialMayor;
53-
}
5457

5558
if (currentSkyblockYear % 8 == 0){
5659
specialMayor = getSpecialMayor(currentSkyblockYear);

0 commit comments

Comments
 (0)