Skip to content

Commit c6ea1bb

Browse files
IExploitableManchri-k
authored andcommitted
Add ender pearls to Entity Owner (MeteorDevelopment#5848)
(cherry picked from commit 9991808)
1 parent 8fc6611 commit c6ea1bb

1 file changed

Lines changed: 9 additions & 4 deletions

File tree

  • src/main/java/meteordevelopment/meteorclient/systems/modules/render

src/main/java/meteordevelopment/meteorclient/systems/modules/render/EntityOwner.java

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,12 @@
2020
import meteordevelopment.meteorclient.utils.render.color.Color;
2121
import meteordevelopment.orbit.EventHandler;
2222
import net.minecraft.entity.Entity;
23+
import net.minecraft.entity.LivingEntity;
2324
import net.minecraft.entity.passive.TameableEntity;
2425
import net.minecraft.entity.player.PlayerEntity;
26+
import net.minecraft.entity.projectile.thrown.EnderPearlEntity;
27+
28+
import org.jetbrains.annotations.Nullable;
2529
import org.joml.Vector3d;
2630

2731
import java.util.HashMap;
@@ -57,17 +61,18 @@ public void onDeactivate() {
5761
@EventHandler
5862
private void onRender2D(Render2DEvent event) {
5963
for (Entity entity : mc.world.getEntities()) {
60-
UUID ownerUuid;
64+
UUID ownerUUID;
6165

62-
if (entity instanceof TameableEntity tameable) ownerUuid = tameable.getOwnerUuid();
66+
if (entity instanceof TameableEntity tameable) ownerUUID = tameable.getOwnerUuid();
67+
else if (entity instanceof EnderPearlEntity pearl && pearl.getOwner() != null) ownerUUID = pearl.getOwner().getUuid();
6368
else continue;
6469

65-
if (ownerUuid != null) {
70+
if (ownerUUID != null) {
6671
Utils.set(pos, entity, event.tickDelta);
6772
pos.add(0, entity.getEyeHeight(entity.getPose()) + 0.75, 0);
6873

6974
if (NametagUtils.to2D(pos, scale.get())) {
70-
renderNametag(getOwnerName(ownerUuid));
75+
renderNametag(getOwnerName(ownerUUID));
7176
}
7277
}
7378
}

0 commit comments

Comments
 (0)