diff --git a/TheButtonAutoFlair.jar b/TheButtonAutoFlair.jar
index 1fb4c10..a20f0c5 100644
Binary files a/TheButtonAutoFlair.jar and b/TheButtonAutoFlair.jar differ
diff --git a/TheButtonAutoFlair/.classpath b/TheButtonAutoFlair/.classpath
index b2c0e7b..b7d5a31 100644
--- a/TheButtonAutoFlair/.classpath
+++ b/TheButtonAutoFlair/.classpath
@@ -33,6 +33,6 @@
-
+
diff --git a/TheButtonAutoFlair/plugin.yml b/TheButtonAutoFlair/plugin.yml
index 3419967..8e8ce62 100644
--- a/TheButtonAutoFlair/plugin.yml
+++ b/TheButtonAutoFlair/plugin.yml
@@ -6,10 +6,10 @@ commands:
description: Auto-flair system. Accept or ignore flair.
usage: "&cUsage: /u accept|ignore|opme&r"
nrp:
- description: Send message in Out-of-Character
+ description: Send message in Out-of-Character.
usage: "&cUsage: /nrp &r"
ooc:
- description: Send message in Out-of-Character
+ description: Send message in Out-of-Character.
usage: "&cUsage: /ooc &r"
unlol:
description: Unlaugh the last laugh.
@@ -22,7 +22,7 @@ commands:
warmode:
description: Toggles war mode
author: NorbiPeti
-depend: [Essentials, Towny, Minigames, Votifier, Factions, WorldGuard, WorldEdit, OreRegenerator, ProtocolLib, FastLogin, Vault]
+depend: [Essentials, Towny, Minigames, Votifier, Factions, WorldGuard, WorldEdit, ProtocolLib, FastLogin, Vault]
permissions:
tbmc.admin:
description: Gives access to /un- commands and /u admin commands
diff --git a/TheButtonAutoFlair/src/tk/sznp/thebuttonautoflair/Commands.java b/TheButtonAutoFlair/src/tk/sznp/thebuttonautoflair/Commands.java
index 831ee17..e241b38 100644
--- a/TheButtonAutoFlair/src/tk/sznp/thebuttonautoflair/Commands.java
+++ b/TheButtonAutoFlair/src/tk/sznp/thebuttonautoflair/Commands.java
@@ -92,17 +92,21 @@ public class Commands implements CommandExecutor {
p.Working = true;
Timer timer = new Timer();
PlayerJoinTimerTask tt = new PlayerJoinTimerTask() {
+ Player player = Bukkit.getPlayer(mp.UUID);
@Override
public void run() {
try {
PluginMain.Instance.DownloadFlair(mp);
} catch (Exception e) {
e.printStackTrace();
+ player.sendMessage("Sorry, but an error occured while trying to get your flair. Please contact a mod.");
+ mp.Working = false;
+ return;
}
- Player player = Bukkit.getPlayer(mp.UUID);
if (mp.FlairState.equals(FlairStates.Commented)) {
player.sendMessage("Sorry, but your flair isn't recorded. Please ask an admin to set it for you. Also, prepare a comment on /r/thebutton, if possible.");
+ mp.Working = false;
return;
}
String flair = mp.GetFormattedFlair();
diff --git a/TheButtonAutoFlair/src/tk/sznp/thebuttonautoflair/PluginMain.java b/TheButtonAutoFlair/src/tk/sznp/thebuttonautoflair/PluginMain.java
index 1a3e357..b1b73e5 100644
--- a/TheButtonAutoFlair/src/tk/sznp/thebuttonautoflair/PluginMain.java
+++ b/TheButtonAutoFlair/src/tk/sznp/thebuttonautoflair/PluginMain.java
@@ -1,6 +1,5 @@
package tk.sznp.thebuttonautoflair;
-import me.steffansk1997.OreRegenerator.OreRegenerator;
import net.milkbowl.vault.chat.Chat;
import net.milkbowl.vault.economy.Economy;
import net.milkbowl.vault.permission.Permission;
@@ -25,8 +24,6 @@ import com.palmergames.bukkit.towny.Towny;
import com.palmergames.bukkit.towny.object.Nation;
import com.palmergames.bukkit.towny.object.Town;
import com.palmergames.bukkit.towny.object.TownyUniverse;
-import com.sk89q.worldguard.bukkit.WorldGuardPlugin;
-import com.sk89q.worldguard.protection.flags.StateFlag;
import java.io.*;
import java.lang.String;
@@ -123,11 +120,6 @@ public class PluginMain extends JavaPlugin { // Translated to Java: 2015.07.15.
GameMechanics.addGameMechanic(new CreativeGlobalMechanic());
- ((WorldGuardPlugin) Bukkit.getPluginManager().getPlugin("WorldGuard"))
- .getRegionManager(Bukkit.getWorlds().get(0))
- .getRegion("__global__")
- .setFlag(OreRegenerator.FLAG_REGENORES, StateFlag.State.DENY);
-
Runnable r = new Runnable() {
public void run() {
ThreadMethod();
diff --git a/TheButtonAutoFlair/target/classes/tk/sznp/thebuttonautoflair/Commands$1.class b/TheButtonAutoFlair/target/classes/tk/sznp/thebuttonautoflair/Commands$1.class
index b1ab2c4..540799d 100644
Binary files a/TheButtonAutoFlair/target/classes/tk/sznp/thebuttonautoflair/Commands$1.class and b/TheButtonAutoFlair/target/classes/tk/sznp/thebuttonautoflair/Commands$1.class differ
diff --git a/TheButtonAutoFlair/target/classes/tk/sznp/thebuttonautoflair/Commands$2.class b/TheButtonAutoFlair/target/classes/tk/sznp/thebuttonautoflair/Commands$2.class
index 6e3964d..00c1b82 100644
Binary files a/TheButtonAutoFlair/target/classes/tk/sznp/thebuttonautoflair/Commands$2.class and b/TheButtonAutoFlair/target/classes/tk/sznp/thebuttonautoflair/Commands$2.class differ
diff --git a/TheButtonAutoFlair/target/classes/tk/sznp/thebuttonautoflair/Commands.class b/TheButtonAutoFlair/target/classes/tk/sznp/thebuttonautoflair/Commands.class
index f94f88c..30580d0 100644
Binary files a/TheButtonAutoFlair/target/classes/tk/sznp/thebuttonautoflair/Commands.class and b/TheButtonAutoFlair/target/classes/tk/sznp/thebuttonautoflair/Commands.class differ
diff --git a/TheButtonAutoFlair/target/classes/tk/sznp/thebuttonautoflair/PluginMain$1.class b/TheButtonAutoFlair/target/classes/tk/sznp/thebuttonautoflair/PluginMain$1.class
index 8acb477..bd07ddb 100644
Binary files a/TheButtonAutoFlair/target/classes/tk/sznp/thebuttonautoflair/PluginMain$1.class and b/TheButtonAutoFlair/target/classes/tk/sznp/thebuttonautoflair/PluginMain$1.class differ
diff --git a/TheButtonAutoFlair/target/classes/tk/sznp/thebuttonautoflair/PluginMain$2.class b/TheButtonAutoFlair/target/classes/tk/sznp/thebuttonautoflair/PluginMain$2.class
index 9cfa7ea..f35aa18 100644
Binary files a/TheButtonAutoFlair/target/classes/tk/sznp/thebuttonautoflair/PluginMain$2.class and b/TheButtonAutoFlair/target/classes/tk/sznp/thebuttonautoflair/PluginMain$2.class differ
diff --git a/TheButtonAutoFlair/target/classes/tk/sznp/thebuttonautoflair/PluginMain.class b/TheButtonAutoFlair/target/classes/tk/sznp/thebuttonautoflair/PluginMain.class
index b0b1f25..e519024 100644
Binary files a/TheButtonAutoFlair/target/classes/tk/sznp/thebuttonautoflair/PluginMain.class and b/TheButtonAutoFlair/target/classes/tk/sznp/thebuttonautoflair/PluginMain.class differ