From 8680710ac829fa777ca70d408cf82a843c6d19b1 Mon Sep 17 00:00:00 2001
From: EastWestFM <eastwest977@gmail.com>
Date: Fri, 14 Nov 2014 21:48:38 +0100
Subject: [PATCH] Update 0.4.1 ;)

---
 pom.xml                                                  | 2 +-
 src/main/java/net/karolek/revoguild/GuildPlugin.java     | 3 +++
 .../net/karolek/revoguild/managers/CombatManager.java    | 6 +++++-
 .../net/karolek/revoguild/managers/GuildManager.java     | 9 ++++-----
 version.txt                                              | 2 +-
 5 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/pom.xml b/pom.xml
index 3e26562..416936b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>net.karolek</groupId>
     <artifactId>revoguild</artifactId>
-    <version>0.4.1-b317</version>
+    <version>0.4.1-b322</version>
     <name>RevoGuild</name>
     <description>Plugin na gildie.</description>
     <properties>
diff --git a/src/main/java/net/karolek/revoguild/GuildPlugin.java b/src/main/java/net/karolek/revoguild/GuildPlugin.java
index 54b0fa0..9864144 100644
--- a/src/main/java/net/karolek/revoguild/GuildPlugin.java
+++ b/src/main/java/net/karolek/revoguild/GuildPlugin.java
@@ -41,6 +41,7 @@ public class GuildPlugin extends JavaPlugin {
 
     private boolean enabled = false;
 
+
     @Override
     public void onEnable() {
         plugin = this;
@@ -82,6 +83,7 @@ public void onEnable() {
 
     @Override
     public void onDisable() {
+        Bukkit.getScheduler().cancelTasks(this);
         if (enabled)
             if (store != null)
                 store.disconnect();
@@ -183,6 +185,7 @@ protected void registerTasks() {
         new TabThread();
     }
 
+
     protected void registerOthers() {
         Logger.info("Register others...");
         if (Config.TNT_DURABILITY_ENABLED)
diff --git a/src/main/java/net/karolek/revoguild/managers/CombatManager.java b/src/main/java/net/karolek/revoguild/managers/CombatManager.java
index b862691..5271067 100644
--- a/src/main/java/net/karolek/revoguild/managers/CombatManager.java
+++ b/src/main/java/net/karolek/revoguild/managers/CombatManager.java
@@ -34,7 +34,11 @@ public static boolean isInFight(Player p) {
     }
 
     public static boolean wasInFight(Player p) {
-        return (System.currentTimeMillis() - combats.get(p.getName()) - 1000L < TimeUtil.SECOND.getTime(Config.ESCAPE_TIME));
+        Long time = combats.get(p.getName());
+
+        if(time == null) return false;
+
+        return (System.currentTimeMillis() - time - 1000L < TimeUtil.SECOND.getTime(Config.ESCAPE_TIME));
     }
 
     public static long getTimeToEnd(Player p) {
diff --git a/src/main/java/net/karolek/revoguild/managers/GuildManager.java b/src/main/java/net/karolek/revoguild/managers/GuildManager.java
index 3dda359..762fd5e 100644
--- a/src/main/java/net/karolek/revoguild/managers/GuildManager.java
+++ b/src/main/java/net/karolek/revoguild/managers/GuildManager.java
@@ -96,11 +96,10 @@ public static boolean canCreateGuild(Location loc) {
         return true;
     }
 
-    public static int getPosition(Guild guild
-    ) {
-        for (RankList.Data<Guild> userData : TabThread.getInstance().getRankList().getTopGuilds())
-            if (userData.getKey().equals(guild))
-                return TabThread.getInstance().getRankList().getTopPlayers().indexOf(userData)+1;
+    public static int getPosition(Guild guild) {
+        for (RankList.Data<Guild> guildData : TabThread.getInstance().getRankList().getTopGuilds())
+            if (guildData.getKey().equals(guild))
+                return TabThread.getInstance().getRankList().getTopGuilds().indexOf(guildData) + 1;
         return -1;
     }
 
diff --git a/version.txt b/version.txt
index bc71ca4..d74287c 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-0.4.1-b316
\ No newline at end of file
+0.4.1-b321
\ No newline at end of file