aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEmeraldMerchant <96396730+EmeraldMerchant@users.noreply.github.com>2022-06-27 20:44:37 +0800
committerGitHub <noreply@github.com>2022-06-27 20:44:37 +0800
commitf1951715adf4c5ff9ceb26c44252dc883252dea0 (patch)
tree6e183dda275ebad383dda7922d8f85d5931fc250
parentaebbb708492f843ab5ac45d392e3322883e34f28 (diff)
downloadSoopyV2-f1951715adf4c5ff9ceb26c44252dc883252dea0.tar.gz
SoopyV2-f1951715adf4c5ff9ceb26c44252dc883252dea0.tar.bz2
SoopyV2-f1951715adf4c5ff9ceb26c44252dc883252dea0.zip
added the things u added
-rw-r--r--features/slayers/index.js14
1 files changed, 12 insertions, 2 deletions
diff --git a/features/slayers/index.js b/features/slayers/index.js
index d7a515f..56551e1 100644
--- a/features/slayers/index.js
+++ b/features/slayers/index.js
@@ -18,6 +18,9 @@ class Slayers extends Feature {
super();
}
+ inSkyblock() {
+ return this.FeatureManager.features["dataLoader"] && this.FeatureManager.features["dataLoader"].class.isInSkyblock
+ }
onEnable() {
this.initVariables();
@@ -96,6 +99,7 @@ class Slayers extends Feature {
this.hudElements.push(this.dulkirThingElement);
this.otherSlayerWaypoints = new ToggleSetting("Show other users slayer boss locations", "May be usefull for loot share", true, "slayer_location_other", this)
+ this.disableEmanTp = new ToggleSetting("Disable enderman Teleportation", "Exact same as feature in SBA", false, "emantp_disable", this)
this.lastSlayerFinishes = [];
this.lastSlayerExps = [];
@@ -251,6 +255,7 @@ class Slayers extends Feature {
this.registerEvent("worldLoad", this.worldLoad);
this.registerStep(true, 2, this.step);
this.registerStep(true, 4, this.step_4fps);
+ this.registerForge(Java.type("net.minecraftforge.event.entity.living.EnderTeleportEvent"), this.emanTp).registeredWhen(() => this.inSkyblock() && this.disableEmanTp.getValue())
this.formatNumber = (HPString) => {
HPString = HPString.removeFormatting().replace("❤", "");
@@ -264,6 +269,10 @@ class Slayers extends Feature {
}
}
+ emanTp(event) {
+ cancel(event)
+ }
+
slayerLocationData(loc, user) {
if (!loc) {
delete this.slayerLocationDataH[user]
@@ -368,7 +377,8 @@ class Slayers extends Feature {
}
if (this.BoxAroundMiniboss.getValue() || this.betterHideDeadEntity.getValue() || this.summonsHideNametag.getValue() || this.summonsShowNametag.getValue() || this.summonsLowWarning.getValue()) {
- World.getAllEntitiesOfType(net.minecraft.entity.item.EntityArmorStand).forEach(name => {
+ let entities = World.getAllEntitiesOfType(net.minecraft.entity.item.EntityArmorStand)
+ for (let name of entities) {
let nameSplit = name.getName().removeFormatting().split(" ")
let MobName = `${nameSplit[0]} ${nameSplit[1]}`
if (this.BoxAroundMiniboss.getValue() && !this.bossSpawnedMessage && this.Miniboss[this.lastSlayerType]?.has(MobName) && !this.minibossEntity.map(a => a[0].getUUID().toString()).includes(name.getUUID().toString())) {
@@ -386,7 +396,7 @@ class Slayers extends Feature {
this.summonEntity.push(name)
}
}
- });
+ };
}
}