Skip to content

Fix turning off InvisibilitySpell #1028

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
TonytheMacaroni merged 1 commit into from
May 21, 2025
Merged

Fix turning off InvisibilitySpell #1028

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
20 changes: 14 additions & 6 deletions core/src/main/java/com/nisovin/magicspells/spells/buff/InvisibilitySpell.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,19 +68,17 @@ public void turnOffBuff(LivingEntity entity) {
protected void turnOff() {
super.turnOff();

if (manager == null) return;
manager.stop();
manager = null;
if (manager != null) manager.stop();
}

@Override
protected @NotNull Collection<UUID> getActiveEntities() {
return manager.entities.keySet();
return manager != null ? manager.getActiveEntities(this) : Collections.emptyList();
}

private static class InvisibilityManager implements Listener {

private final Object2ObjectArrayMap<UUID, InvisibilityData> entities = new Object2ObjectArrayMap<>();
private final Map<UUID, InvisibilityData> entities = new Object2ObjectArrayMap<>();

public InvisibilityManager() {
MagicSpells.registerEvents(this);
Expand Down Expand Up @@ -111,6 +109,13 @@ public boolean isActive(InvisibilitySpell spell, LivingEntity entity) {
return data != null && data.spells.containsKey(spell.internalName);
}

public Collection<UUID> getActiveEntities(InvisibilitySpell spell) {
return entities.entrySet().stream()
.filter(entry -> entry.getValue().spells.containsKey(spell.internalName))
.map(Map.Entry::getKey)
.toList();
}

public void turnOffBuff(InvisibilitySpell spell, LivingEntity entity) {
UUID uuid = entity.getUniqueId();
InvisibilityData data = entities.get(uuid);
Expand All @@ -136,7 +141,10 @@ public void turnOffBuff(InvisibilitySpell spell, LivingEntity entity) {
}

public void stop() {
entities.clear();
// Only stop if all other InvisibilitySpell instances with active casts have been turned off.
if (!entities.isEmpty()) return;

InvisibilitySpell.manager = null;
HandlerList.unregisterAll(this);
}

Expand Down