diff --git a/NightX.iws b/NightX.iws
index 88332132..789812e1 100644
--- a/NightX.iws
+++ b/NightX.iws
@@ -6,8 +6,9 @@
-
+
+
@@ -61,7 +62,7 @@
-
+
@@ -139,7 +140,7 @@
-
+
@@ -154,7 +155,7 @@
-
+
@@ -199,7 +200,7 @@
-
+
@@ -214,7 +215,7 @@
-
+
@@ -229,7 +230,7 @@
-
+
@@ -244,7 +245,7 @@
-
+
@@ -259,7 +260,7 @@
-
+
@@ -274,7 +275,7 @@
-
+
@@ -301,7 +302,7 @@
-
+
@@ -316,7 +317,7 @@
-
+
@@ -361,7 +362,7 @@
-
+
@@ -376,7 +377,7 @@
-
+
@@ -391,7 +392,7 @@
-
+
@@ -406,7 +407,7 @@
-
+
@@ -421,7 +422,7 @@
-
+
@@ -436,7 +437,7 @@
-
+
diff --git a/src/main/java/net/aspw/client/features/module/impl/combat/AutoHeal.kt b/src/main/java/net/aspw/client/features/module/impl/combat/AutoHeal.kt
index eaae318a..2da06494 100644
--- a/src/main/java/net/aspw/client/features/module/impl/combat/AutoHeal.kt
+++ b/src/main/java/net/aspw/client/features/module/impl/combat/AutoHeal.kt
@@ -84,7 +84,7 @@ class AutoHeal : Module() {
}
override fun onDisable() {
- isRotating = false
+ resetAll()
}
override fun onEnable() {
@@ -108,9 +108,21 @@ class AutoHeal : Module() {
@EventTarget(priority = 2)
fun onMotion(event: MotionEvent) {
if (autoPotValue.get()) {
- if (mc.thePlayer.fallDistance < 0.8) return
if (event.eventState == EventState.PRE) {
- if (smartValue.get() && !throwQueue.isEmpty()) {
+ if (throwing && mc.currentScreen !is GuiContainer && (!killAura?.state!! || killAura.target == null) && !scaffold?.state!!) {
+ if (mc.thePlayer.onGround) {
+ mc.thePlayer.motionX = 0.0
+ mc.thePlayer.motionZ = 0.0
+ mc.thePlayer.jump()
+ debug("jumped")
+ }
+ RotationUtils.reset() // reset all rotations
+ event.pitch = if (customPitchValue.get()) customPitchAngle.get() else 90F
+ debug("silent rotation")
+ isRotating = true
+ }
+
+ if (smartValue.get() && throwQueue.isNotEmpty()) {
var foundPot = false
for (k in throwQueue.indices.reversed()) {
if (mc.thePlayer.isPotionActive(throwQueue[k])) {
@@ -167,21 +179,6 @@ class AutoHeal : Module() {
debug("found pot, queueing")
}
}
-
- if (throwing && mc.currentScreen !is GuiContainer && (!killAura?.state!! || killAura.target == null) && !scaffold?.state!!) {
- if (mc.thePlayer.onGround) {
- mc.thePlayer.motionX = 0.0
- mc.thePlayer.motionZ = 0.0
- mc.thePlayer.jump()
- debug("jumped")
- }
- RotationUtils.reset() // reset all rotations
- event.pitch = if (customPitchValue.get()) customPitchAngle.get() else 90F
- debug("silent rotation")
- isRotating = true
- } else {
- isRotating = false
- }
}
}
}
@@ -281,7 +278,6 @@ class AutoHeal : Module() {
@EventTarget(priority = -1)
fun onMotionPost(event: MotionEvent) {
if (autoPotValue.get()) {
- if (mc.thePlayer.fallDistance < 0.8) return
if (event.eventState == EventState.POST) {
if (throwing && mc.currentScreen !is GuiContainer
&& !mc.thePlayer.onGround
@@ -306,9 +302,9 @@ class AutoHeal : Module() {
isRotating = false
debug("thrown")
} else {
- // refind
potIndex = -1
throwing = false
+ isRotating = false
debug("failed to retrieve potion info, retrying...")
}
}
diff --git a/src/main/java/net/aspw/client/features/module/impl/visual/Hud.kt b/src/main/java/net/aspw/client/features/module/impl/visual/Hud.kt
index 24151b52..ccf948a0 100644
--- a/src/main/java/net/aspw/client/features/module/impl/visual/Hud.kt
+++ b/src/main/java/net/aspw/client/features/module/impl/visual/Hud.kt
@@ -8,6 +8,7 @@ import net.aspw.client.features.module.ModuleInfo
import net.aspw.client.util.AnimationUtils
import net.aspw.client.util.render.RenderUtils
import net.aspw.client.value.*
+import net.aspw.client.visual.client.GuiTeleportation
import net.aspw.client.visual.client.clickgui.dropdown.ClickGui
import net.aspw.client.visual.client.clickgui.tab.NewUi
import net.aspw.client.visual.font.Fonts
@@ -73,7 +74,7 @@ class Hud : Module() {
}
if (mc.theWorld == null || mc.thePlayer == null) return
- if (noInvClose.get() && event.packet is S2EPacketCloseWindow && (mc.currentScreen is GuiInventory || mc.currentScreen is NewUi || mc.currentScreen is ClickGui || mc.currentScreen is GuiChat)) {
+ if (noInvClose.get() && event.packet is S2EPacketCloseWindow && (mc.currentScreen is GuiInventory || mc.currentScreen is NewUi || mc.currentScreen is ClickGui || mc.currentScreen is GuiChat || mc.currentScreen is GuiTeleportation)) {
event.cancelEvent()
}
}
diff --git a/src/main/java/net/aspw/client/injection/forge/mixins/entity/MixinEntityPlayerSP.java b/src/main/java/net/aspw/client/injection/forge/mixins/entity/MixinEntityPlayerSP.java
index 9a683362..8adc2c99 100644
--- a/src/main/java/net/aspw/client/injection/forge/mixins/entity/MixinEntityPlayerSP.java
+++ b/src/main/java/net/aspw/client/injection/forge/mixins/entity/MixinEntityPlayerSP.java
@@ -205,16 +205,6 @@ public void onUpdateWalkingPlayer() {
final KillAura killAura = Objects.requireNonNull(Client.moduleManager.getModule(KillAura.class));
final TPAura tpAura = Objects.requireNonNull(Client.moduleManager.getModule(TPAura.class));
- float yaw = event.getYaw();
- float pitch = event.getPitch();
- float lastReportedYaw = RotationUtils.serverRotation.getYaw();
- float lastReportedPitch = RotationUtils.serverRotation.getPitch();
-
- if (RotationUtils.targetRotation != null) {
- yaw = RotationUtils.targetRotation.getYaw();
- pitch = RotationUtils.targetRotation.getPitch();
- }
-
if (mc.thePlayer.isSneaking() && (mc.thePlayer.isBlocking() || (killAura.getState() && killAura.getTarget() != null && !killAura.getAutoBlockModeValue().get().equals("None") || tpAura.getState() && tpAura.isBlocking())))
mc.thePlayer.renderArmYaw = mc.thePlayer.rotationYaw - 40F;
@@ -247,6 +237,16 @@ public void onUpdateWalkingPlayer() {
}
if (this.isCurrentViewEntity()) {
+ float yaw = event.getYaw();
+ float pitch = event.getPitch();
+ float lastReportedYaw = RotationUtils.serverRotation.getYaw();
+ float lastReportedPitch = RotationUtils.serverRotation.getPitch();
+
+ if (RotationUtils.targetRotation != null) {
+ yaw = RotationUtils.targetRotation.getYaw();
+ pitch = RotationUtils.targetRotation.getPitch();
+ }
+
final AntiDesync antiDesync = Objects.requireNonNull(Client.moduleManager.getModule(AntiDesync.class));
double xDiff = event.getX() - this.lastReportedPosX;
double yDiff = event.getY() - this.lastReportedPosY;