Skip to content

[pull] master from mcMMO-Dev:master #32

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

Merged
pull merged 1 commit into from
Feb 13, 2026
Merged

[pull] master from mcMMO-Dev:master #32

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
42 changes: 12 additions & 30 deletions src/main/java/com/gmail/nossr50/skills/archery/Archery.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,18 @@
import com.gmail.nossr50.mcMMO;
import com.gmail.nossr50.util.ItemUtils;
import com.gmail.nossr50.util.skills.RankUtils;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.UUID;
import java.util.concurrent.ConcurrentHashMap;

import org.bukkit.Material;
import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack;
import org.jetbrains.annotations.NotNull;

public class Archery {
private static final List<TrackedEntity> trackedEntities = new ArrayList<>();
private static final Map<UUID, TrackedEntity> trackedEntities = new ConcurrentHashMap<>();

public static double skillShotMaxBonusDamage = mcMMO.p.getAdvancedConfig()
.getSkillShotDamageMax();
Expand All @@ -27,25 +28,12 @@ public class Archery {
.getArcheryDistanceMultiplier();

protected static void incrementTrackerValue(LivingEntity livingEntity) {
for (TrackedEntity trackedEntity : trackedEntities) {
if (trackedEntity.getLivingEntity().getEntityId() == livingEntity.getEntityId()) {
trackedEntity.incrementArrowCount();
return;
}
}

addToTracker(livingEntity); // If the entity isn't tracked yet
}

protected static void addToTracker(LivingEntity livingEntity) {
TrackedEntity trackedEntity = new TrackedEntity(livingEntity);

final TrackedEntity trackedEntity = trackedEntities.computeIfAbsent(livingEntity.getUniqueId(), k -> new TrackedEntity(livingEntity));
trackedEntity.incrementArrowCount();
trackedEntities.add(trackedEntity);
}

protected static void removeFromTracker(TrackedEntity trackedEntity) {
trackedEntities.remove(trackedEntity);
trackedEntities.remove(trackedEntity.getID());
}

/**
Expand All @@ -54,17 +42,11 @@ protected static void removeFromTracker(TrackedEntity trackedEntity) {
* @param livingEntity The entity hit by the arrows
*/
public static void arrowRetrievalCheck(@NotNull LivingEntity livingEntity) {
for (Iterator<TrackedEntity> entityIterator = trackedEntities.iterator();
entityIterator.hasNext(); ) {
TrackedEntity trackedEntity = entityIterator.next();

if (trackedEntity.getID() == livingEntity.getUniqueId()) {
ItemUtils.spawnItems(null, livingEntity.getLocation(),
new ItemStack(Material.ARROW), trackedEntity.getArrowCount(),
ItemSpawnReason.ARROW_RETRIEVAL_ACTIVATED);
entityIterator.remove();
return;
}
final TrackedEntity trackedEntity = trackedEntities.remove(livingEntity.getUniqueId());
if (trackedEntity != null) {
ItemUtils.spawnItems(null, livingEntity.getLocation(),
new ItemStack(Material.ARROW), trackedEntity.getArrowCount(),
ItemSpawnReason.ARROW_RETRIEVAL_ACTIVATED);
}
}

Expand Down