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

Persistent entities should never be removed. (#1608) 

* Persistent entities should never be removed.

There is no valid reason why BentoBox should remove the Persistent entity. Otherwise, what is the point of being persistent if someone can just remove it?

* Changes which mobs can be removed outside island

Protect renamed and persistent entities from being removed if they wander outside island bounds.
Except for animals, as they cannot be removed only if they are renamed.
This commit is contained in:
BONNe 2020-12-19 18:56:29 +02:00 committed by GitHub
parent e608a95442
commit 0e4b3b40fa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 1 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,6 +4,7 @@ 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;
@ -34,6 +35,10 @@ 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

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