Skip to content

reduce allocations in explosion damage calculations #6655

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
xpncvr wants to merge 1 commit into
base: master
Choose a base branch
from
+8 −3
Open

reduce allocations in explosion damage calculations #6655

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions src/main/java/meteordevelopment/meteorclient/utils/entity/DamageUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

import it.unimi.dsi.fastutil.objects.Object2IntMap;
import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap;
import meteordevelopment.meteorclient.mixininterface.IVec3;
import meteordevelopment.meteorclient.utils.Utils;
import meteordevelopment.meteorclient.utils.entity.fakeplayer.FakePlayerEntity;
import meteordevelopment.meteorclient.utils.player.PlayerUtils;
Expand Down Expand Up @@ -306,10 +307,11 @@ private static float protectionReduction(LivingEntity player, float damage, Dama

int damageProtection = 0;

Object2IntMap<Holder<Enchantment>> enchantments = new Object2IntOpenHashMap<>();

for (EquipmentSlot slot : EquipmentSlotGroup.ARMOR) {
ItemStack stack = player.getItemBySlot(slot);

Object2IntMap<Holder<Enchantment>> enchantments = new Object2IntOpenHashMap<>();
Utils.getEnchantments(stack, enchantments);

int protection = Utils.getEnchantmentLevel(enchantments, Enchantments.PROTECTION);
Expand Down Expand Up @@ -384,12 +386,15 @@ private static float getExposure(Vec3 source, AABB box, RaycastFactory raycastFa
double endY = box.maxY;
double endZ = box.maxZ + zOffset;

Vec3 position = new Vec3(0, 0, 0);
ExposureRaycastContext context = new ExposureRaycastContext(position, source);

for (double x = startX; x <= endX; x += xStep) {
for (double y = startY; y <= endY; y += yStep) {
for (double z = startZ; z <= endZ; z += zStep) {
Vec3 position = new Vec3(x, y, z);
((IVec3) position).meteor$set(x, y, z);

if (raycast(new ExposureRaycastContext(position, source), raycastFactory) == null) misses++;
if (raycast(context, raycastFactory) == null) misses++;

hits++;
}
Expand Down