Upstream
/
bentobox
mirror of https://github.com/BentoBoxWorld/BentoBox.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Revert "Persistent entities should never be removed. (#1608)" (#1626) 

This reverts commit 0e4b3b40fa.
This commit is contained in:
tastybento 2020-12-31 09:51:09 -08:00 committed by GitHub
parent 93cb2d64d9
commit 054ed30577
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/world/bentobox/bentobox/listeners/flags/worldsettings/GeoLimitMobsListener.java
View File

@ -4,7 +4,6 @@ import java.util.Map;
import java.util.WeakHashMap;
import org.bukkit.Bukkit;
import org.bukkit.entity.Animals;
import org.bukkit.entity.Entity;
import org.bukkit.entity.Projectile;
import org.bukkit.event.EventHandler;
@ -35,10 +34,6 @@ public class GeoLimitMobsListener extends FlagListener {
// Kick off the task to remove entities that go outside island boundaries
Bukkit.getScheduler().runTaskTimer(getPlugin(), () -> {
mobSpawnTracker.entrySet().stream()
// Renamed entities should never be removed. Even if they moved 2k blocks away.
.filter(e -> e.getKey().getCustomName() == null)
// Persistent entities should never be removed, unless they are animals.
.filter(e -> !e.getKey().isPersistent() || e.getKey() instanceof Animals)
.filter(e -> !e.getValue().onIsland(e.getKey().getLocation()))
.map(Map.Entry::getKey)
.forEach(Entity::remove);

3
src/main/java/world/bentobox/bentobox/managers/IslandsManager.java
View File

@ -1386,8 +1386,7 @@ public class IslandsManager {
loc.getWorld().getNearbyEntities(loc, plugin.getSettings().getClearRadius(),
plugin.getSettings().getClearRadius(),
plugin.getSettings().getClearRadius()).stream()
.filter(en -> !en.isPersistent()
&& Util.isHostileEntity(en)
.filter(en -> Util.isHostileEntity(en)
&& !plugin.getIWM().getRemoveMobsWhitelist(loc.getWorld()).contains(en.getType())
&& !(en instanceof PufferFish))
.filter(en -> en.getCustomName() == null)