Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-01-10 10:17:38 +01:00
Code Issues Projects Releases Wiki Activity

SPIGOT-5010: World.getEntities returns entities in border chunks

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot 2019-05-31 06:56:00 +10:00
parent 624908bdfc
commit d7c1a6ed5f
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
paper-server/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
View File

@ -811,7 +811,7 @@ public class CraftWorld implements World {
Entity bukkitEntity = mcEnt.getBukkitEntity(); Entity bukkitEntity = mcEnt.getBukkitEntity();
// Assuming that bukkitEntity isn't null // Assuming that bukkitEntity isn't null
if (bukkitEntity != null) { if (bukkitEntity != null && bukkitEntity.isValid()) {
list.add(bukkitEntity); list.add(bukkitEntity);
} }
} }
@ -830,7 +830,7 @@ public class CraftWorld implements World {
Entity bukkitEntity = mcEnt.getBukkitEntity(); Entity bukkitEntity = mcEnt.getBukkitEntity();
// Assuming that bukkitEntity isn't null // Assuming that bukkitEntity isn't null
if (bukkitEntity != null && bukkitEntity instanceof LivingEntity) { if (bukkitEntity != null && bukkitEntity instanceof LivingEntity && bukkitEntity.isValid()) {
list.add((LivingEntity) bukkitEntity); list.add((LivingEntity) bukkitEntity);
} }
} }