aboutsummaryrefslogtreecommitdiff
path: root/features
diff options
context:
space:
mode:
authorSoopyboo32 <49228220+Soopyboo32@users.noreply.github.com>2022-05-26 19:56:02 +0800
committerSoopyboo32 <49228220+Soopyboo32@users.noreply.github.com>2022-05-26 19:56:02 +0800
commita0ae59e33748047377b5ae65df675759a10bff18 (patch)
tree5358991c5b7bed018a126e9a0af1a9dc55b4a0d3 /features
parentd24e54df28d92afebcd6d890e579340df84a010b (diff)
downloadSoopyV2-a0ae59e33748047377b5ae65df675759a10bff18.tar.gz
SoopyV2-a0ae59e33748047377b5ae65df675759a10bff18.tar.bz2
SoopyV2-a0ae59e33748047377b5ae65df675759a10bff18.zip
+ fix sending boss into to wrong players sometimes
+ fix next ch event display for some people + change gemstone $/h to show both hours + minuites instead of just minuites / just hours
Diffstat (limited to 'features')
-rw-r--r--features/dataLoader/index.js6
-rw-r--r--features/mining/index.js6
2 files changed, 6 insertions, 6 deletions
diff --git a/features/dataLoader/index.js b/features/dataLoader/index.js
index f0ede23..b933e31 100644
--- a/features/dataLoader/index.js
+++ b/features/dataLoader/index.js
@@ -151,11 +151,11 @@ class DataLoader extends Feature {
this.area = this.stats["Area"]
- if (this.lastServer !== this.FeatureManager.features["dataLoader"].class.stats.Server || Date.now() - this.lastSentServer > 60000 * 5) {
- this.lastServer = this.FeatureManager.features["dataLoader"].class.stats.Server;
+ if (this.lastServer !== this.stats.Server || Date.now() - this.lastSentServer > 60000 * 5) {
+ this.lastServer = this.stats.Server;
this.lastSentServer = Date.now()
- socketConnection.setServer(this.FeatureManager.features["dataLoader"].class.stats.Server);
+ socketConnection.setServer(this.stats.Server, this.area, this.areaFine);
}
}
diff --git a/features/mining/index.js b/features/mining/index.js
index dec8728..9a9a881 100644
--- a/features/mining/index.js
+++ b/features/mining/index.js
@@ -76,7 +76,7 @@ class Mining extends Feature {
this.armourstandClass = Java.type("net.minecraft.entity.item.EntityArmorStand").class
- this.registerEvent("renderOverlay", this.renderOverlay).registeredWhen(() => this.balRespawnHud.getValue() || this.compactProgressHud.getValue() || this.gemstoneMoneyHud.getValue())
+ this.registerEvent("renderOverlay", this.renderOverlay).registeredWhen(() => this.balRespawnHud.getValue() || this.compactProgressHud.getValue() || this.gemstoneMoneyHud.getValue() || this.nextChEvent.getValue())
this.registerEvent("tick", this.tick)
this.registerEvent("itemTooltip", this.itemTooltipEvent).registeredWhen(() => this.showContainedGemstoneSlots.getValue() || this.showUnlockedGemstoneSlots.getValue())
this.registerEvent("renderWorld", this.renderWorld).registeredWhen(() => this.guessBalHp.getValue())
@@ -133,12 +133,12 @@ class Mining extends Feature {
let moneyPerHour = Math.floor(money / ((Date.now() - startingTime) / (1000 * 60 * 60)))
let moneyMade = Math.floor(money)
- let timeTracked = timeSince(startingTime)
+ let timeTracked = timeSince2(startingTime)
this.gemstoneMoneyHudElement.setText("&6$/h&7> &f$" + numberWithCommas(moneyPerHour) + "\n&6$ made&7> &f$" + numberWithCommas(moneyMade) + "\n&6Time tracked&7> &f" + timeTracked)
})
this.registerStep(false, 10, () => {
- if (lastMined && Date.now() - lastMined > 60000) {
+ if (lastMined && Date.now() - lastMined > 2 * 60000) {
money = 0
startingTime = -1
lastMined = 0