Merge remote-tracking branch 'origin/post-wipe-merge' into feature-db-agnostic-realms

src/engine/objects/PlayerCharacter.java

@@ -2213,7 +2213,7 @@ public void dismissNecroPets() {
 			for (Effect eff : playerCharacter.getEffects().values()) {
 				if (eff.getPower() == null && otherPlayer)
 					continue;
-				if (eff.getPower().token == 429506619) // Oblivion's Caress
+				if (eff.getPower() != null && eff.getPower().token == 429506619) // Oblivion's Caress
 					continue;
 				if ( !eff.serializeForLoad(writer))
 					continue;