From 74518188962888779b74495154d7018f97b90e24 Mon Sep 17 00:00:00 2001 From: mcmonkey4eva Date: Tue, 20 Oct 2015 19:33:57 -0700 Subject: [PATCH] Maybe fix #1197 --- .../java/net/aufdemrand/denizen/npc/traits/SittingTrait.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main/java/net/aufdemrand/denizen/npc/traits/SittingTrait.java b/src/main/java/net/aufdemrand/denizen/npc/traits/SittingTrait.java index d1e4e6f9bc..54eec56c09 100644 --- a/src/main/java/net/aufdemrand/denizen/npc/traits/SittingTrait.java +++ b/src/main/java/net/aufdemrand/denizen/npc/traits/SittingTrait.java @@ -42,6 +42,10 @@ public void onSpawn() { @Override public void onDespawn() { + if (npc == null || npc.getEntity() == null) { + // Wat. + return; + } if (npc.getEntity().getVehicle() != null) { npc.getEntity().getVehicle().setPassenger(null); }