Skip to content

Fix entity purging should ignore players #3472

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
benwoo1110 wants to merge 1 commit into
base: v5.7
Choose a base branch
from
+12 −12
Open

Fix entity purging should ignore players #3472

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
24 changes: 12 additions & 12 deletions src/main/java/org/mvplugins/multiverse/core/world/entity/EntityPurger.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package org.mvplugins.multiverse.core.world.entity;

import org.bukkit.entity.Entity;
import org.bukkit.entity.Player;
import org.bukkit.entity.SpawnCategory;
import org.jvnet.hk2.annotations.Service;
import org.mvplugins.multiverse.core.world.LoadedMultiverseWorld;
Expand Down Expand Up @@ -40,25 +41,24 @@ public int purgeEntities(LoadedMultiverseWorld world, SpawnCategory spawnCategor
public int purgeEntities(LoadedMultiverseWorld world, SpawnCategory... spawnCategories) {
Set<SpawnCategory> spawnCategoriesSet = Set.of(spawnCategories);
AtomicInteger purgeCount = new AtomicInteger(0);
world.getBukkitWorld().peek(bukkitWorld -> {
for (Entity entity : bukkitWorld.getEntities()) {
if (spawnCategoriesSet.contains(entity.getSpawnCategory())) {
world.getBukkitWorld().peek(bukkitWorld -> bukkitWorld.getEntities().stream()
.filter(entity -> !(entity instanceof Player))
.filter(entity -> spawnCategoriesSet.contains(entity.getSpawnCategory()))
.forEach(entity -> {
entity.remove();
purgeCount.incrementAndGet();
}
}
});
}));
return purgeCount.get();
}

public int purgeAllEntities(LoadedMultiverseWorld world) {
AtomicInteger purgeCount = new AtomicInteger(0);
world.getBukkitWorld().peek(bukkitWorld -> {
for (Entity entity : bukkitWorld.getEntities()) {
entity.remove();
purgeCount.incrementAndGet();
}
});
world.getBukkitWorld().peek(bukkitWorld -> bukkitWorld.getEntities().stream()
.filter(entity -> !(entity instanceof Player))
.forEach(entity -> {
entity.remove();
purgeCount.incrementAndGet();
}));
return purgeCount.get();
}
}
Loading