Upstream/bentobox
1
0
Fork 0
mirror of https://github.com/BentoBoxWorld/BentoBox.git synced 2024-11-24 19:55:17 +01:00
Code Issues Projects Releases Wiki Activity

Fix for null entities.

Browse Source 
https://github.com/tastybento/bskyblock/issues/206
This commit is contained in:
tastybento 2018-07-17 07:54:22 -07:00
parent 5572875257
commit ee440b4f0d
2 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/us/tastybento/bskyblock/listeners/flags/MobSpawnListener.java
View File

@ -30,7 +30,7 @@ public class MobSpawnListener extends AbstractFlagListener {
@EventHandler(priority = EventPriority.LOW, ignoreCancelled = true) @EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
public boolean onNaturalMobSpawn(CreatureSpawnEvent e) { public boolean onNaturalMobSpawn(CreatureSpawnEvent e) {
// If not in the right world, return // If not in the right world, return
if (!getIWM().inWorld(e.getEntity().getLocation())) { if (e.getEntity() == null || !getIWM().inWorld(e.getEntity().getLocation())) {
return false; return false;
} }
// Deal with natural spawning // Deal with natural spawning

7
src/test/java/us/tastybento/bskyblock/listeners/flags/MobSpawnListenerTest.java
View File

@ -126,6 +126,13 @@ public class MobSpawnListenerTest {
} }
@Test
public void testNullEntity() {
CreatureSpawnEvent e = new CreatureSpawnEvent(null, SpawnReason.NATURAL);
MobSpawnListener l = new MobSpawnListener();
assertFalse(l.onNaturalMobSpawn(e));
assertFalse(e.isCancelled());
}
@Test @Test
public void testNotInWorld() { public void testNotInWorld() {