Upstream/DungeonsXL
1
0
Fork 0
mirror of https://github.com/DRE2N/DungeonsXL.git synced 2025-02-17 21:02:12 +01:00
Code Issues Projects Releases Wiki Activity

Fix game == null NPEs; resolves #538

Browse Source
This commit is contained in:
Daniel Saukel 2019-02-21 19:11:50 +01:00
parent 8c117c8e2b
commit fae084795a
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/de/erethon/dungeonsxl/world/DWorldListener.java
View File

@ -165,6 +165,9 @@ public class DWorldListener implements Listener {
return;
}
Game game = Game.getByGameWorld(gameWorld);
if (game == null) {
return;
}
Set<ExMob> prot = interact ? game.getRules().getInteractionProtectedEntities() : game.getRules().getDamageProtectedEntities();
if (prot.contains(caliburn.getExMob(entity))) {
event.setCancelled(true);
@ -187,7 +190,7 @@ public class DWorldListener implements Listener {
event.setCancelled(true);
} else if (dWorld instanceof DGameWorld) {
Game game = Game.getByGameWorld((DGameWorld) dWorld);
if (game == null || game.getRules() == null) {
if (game == null) {
return;
}
Boolean raining = game.getRules().isRaining();