From 25be687762308544ab3ee2084f0fa53565619cdd Mon Sep 17 00:00:00 2001
From: Eric Stokes <fernferret@gmail.com>
Date: Mon, 21 Nov 2011 21:55:28 -0700
Subject: [PATCH] Fix NPE

---
 .../onarandombox/MultiverseCore/listeners/MVEntityListener.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/onarandombox/MultiverseCore/listeners/MVEntityListener.java b/src/main/java/com/onarandombox/MultiverseCore/listeners/MVEntityListener.java
index fcfff78a..c3a7cfa9 100644
--- a/src/main/java/com/onarandombox/MultiverseCore/listeners/MVEntityListener.java
+++ b/src/main/java/com/onarandombox/MultiverseCore/listeners/MVEntityListener.java
@@ -75,7 +75,7 @@ public class MVEntityListener extends EntityListener {
             Player player = (Player) defender;
             World w = player.getWorld();
 
-            if (!this.worldManager.isMVWorld(w.getName())) {
+            if (w == null || !this.worldManager.isMVWorld(w.getName())) {
                 // if the world is not handled, we don't care
                 return;
             }