From 95ab22a5549ba6719c04752e87dea780e06c3342 Mon Sep 17 00:00:00 2001 From: MistPhizzle Date: Sat, 12 Jul 2014 19:16:13 -0400 Subject: [PATCH] Try to fix NPE on Chi Passive --- Dev Builds/Korra.jar | Bin 370580 -> 370600 bytes .../ProjectKorra/chiblocking/ChiPassive.java | 1 + src/plugin.yml | 2 +- 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Dev Builds/Korra.jar b/Dev Builds/Korra.jar index 8bd745cf9add5e92a1a1a66d54b1e3422ed01dcb..ba1d0b32ac8dd7e29922047ade611ec465f848e1 100644 GIT binary patch delta 3588 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 diff --git a/src/com/projectkorra/ProjectKorra/chiblocking/ChiPassive.java b/src/com/projectkorra/ProjectKorra/chiblocking/ChiPassive.java index f534ebe5..94639bdf 100644 --- a/src/com/projectkorra/ProjectKorra/chiblocking/ChiPassive.java +++ b/src/com/projectkorra/ProjectKorra/chiblocking/ChiPassive.java @@ -53,6 +53,7 @@ public class ChiPassive { } for (String s: BendingPlayer.blockedChi.keySet()) { if (!(BendingPlayer.blockedChi.get(s) + duration >= System.currentTimeMillis())) { + if (Methods.getBendingPlayer(s) == null) continue; Methods.getBendingPlayer(s).unblockChi(); } // if (BendingPlayer.blockedChi.contains(player.getName())) { diff --git a/src/plugin.yml b/src/plugin.yml index 3b40903f..9ce60293 100644 --- a/src/plugin.yml +++ b/src/plugin.yml @@ -1,6 +1,6 @@ name: ProjectKorra author: ProjectKorra -version: 1.2.0 BETA 9 +version: 1.2.0 BETA 10 main: com.projectkorra.ProjectKorra.ProjectKorra commands: projectkorra: