diff options
| author | Soopyboo32 <49228220+Soopyboo32@users.noreply.github.com> | 2021-12-20 19:42:35 +0800 |
|---|---|---|
| committer | Soopyboo32 <49228220+Soopyboo32@users.noreply.github.com> | 2021-12-20 19:42:35 +0800 |
| commit | 40fe8ba729128f03bc394034f2d62ffcac3542ec (patch) | |
| tree | d626c666e5c8f755dd838aaed9c9f061bcc27c46 | |
| parent | ac6eba1159f12c8830fc9f93c1663cedaf7cc6c4 (diff) | |
| parent | 7ba8a279a81d6b9c3e51fd451150d3a0f741057a (diff) | |
| download | SoopyV2-40fe8ba729128f03bc394034f2d62ffcac3542ec.tar.gz SoopyV2-40fe8ba729128f03bc394034f2d62ffcac3542ec.tar.bz2 SoopyV2-40fe8ba729128f03bc394034f2d62ffcac3542ec.zip | |
Merge branch 'master' of https://github.com/Soopyboo32/SoopyV2
| -rw-r--r-- | features/betterGuis/museumGui.js | 2 | ||||
| -rw-r--r-- | features/slayers/index.js | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/features/betterGuis/museumGui.js b/features/betterGuis/museumGui.js index 1dec09c..44d4d41 100644 --- a/features/betterGuis/museumGui.js +++ b/features/betterGuis/museumGui.js @@ -450,7 +450,7 @@ class MuseumGui { donateArmorSets[setId] = (donateArmorSets[setId]||0)+1 - if(donateArmorSets[setId] === 4){ + if(donateArmorSets[setId] === 3){ this.donateItems.push({ sb_id: sb_id || "NA", name: item.getName() || "", diff --git a/features/slayers/index.js b/features/slayers/index.js index 5b6e5ac..e2adcfd 100644 --- a/features/slayers/index.js +++ b/features/slayers/index.js @@ -44,7 +44,7 @@ class Slayers extends Feature { this.slayerExp[this.lastSlayerType] = this.lastSlayerExp + (this.slayerExp[this.lastSlayerType] || 0) if(this.expOnKill.getValue()){ cancel(e) - ChatLib.chat("&r &r&a&lSLAYER QUEST COMPLETE!&r") + ChatLib.chat("&r &r&a&lSLAYER QUEST COMPLETE!&a&r") ChatLib.chat("&r &r&aYou have &d" + numberWithCommas(this.slayerExp[this.lastSlayerType]) + " " + this.lastSlayerType + " XP&r&7!&r") ChatLib.chat("&r &r&aYou have &d" + numberWithCommas(Object.values(this.slayerExp).reduce((a, t)=>t+a, 0)) + " total XP&r&7!&r") if(Date.now()-this.lastBossSlain < 60000*5) ChatLib.chat("&r &r&aBoss took &d" + timeNumber((Date.now()-this.lastBossSlain)) + " &ato spawn and kill&r&7!"+/* (" + timeNumber(Date.now()-this.lastBossSpawned) + " to kill) */"&r") //TODO: Seperate setting for this @@ -314,7 +314,7 @@ class Slayers extends Feature { }) if(this.emanBoss){ - this.emanHpElement.setText("&6Enderman&7> " + this.emanBoss.getName().split("Voidgloom Seraph")[1].trim()) + this.emanHpElement.setText("&6Enderman&7> " + (this.emanBoss.getName().split("Voidgloom Seraph")[1]||"").trim()) }else{ this.emanHpElement.setText("") } |