diff --git a/BuildConfigUpdater/BuildConfigUpdater.iml b/BuildConfigUpdater/BuildConfigUpdater.iml
index cea34c4..31ba17d 100644
--- a/BuildConfigUpdater/BuildConfigUpdater.iml
+++ b/BuildConfigUpdater/BuildConfigUpdater.iml
@@ -13,7 +13,6 @@
-
diff --git a/ButtonCore/ButtonCore (1) (com.github.TBMCPlugins.ButtonCore).iml b/ButtonCore/ButtonCore (1) (com.github.TBMCPlugins.ButtonCore).iml
new file mode 100644
index 0000000..fbd4f39
--- /dev/null
+++ b/ButtonCore/ButtonCore (1) (com.github.TBMCPlugins.ButtonCore).iml
@@ -0,0 +1,38 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/ButtonCore/src/main/java/buttondevteam/core/component/towny/TownyComponent.java b/ButtonCore/src/main/java/buttondevteam/core/component/towny/TownyComponent.java
index 42c857d..3d8966d 100644
--- a/ButtonCore/src/main/java/buttondevteam/core/component/towny/TownyComponent.java
+++ b/ButtonCore/src/main/java/buttondevteam/core/component/towny/TownyComponent.java
@@ -5,10 +5,10 @@ import buttondevteam.core.MainPlugin;
import buttondevteam.lib.TBMCCoreAPI;
import buttondevteam.lib.architecture.Component;
import com.palmergames.bukkit.towny.Towny;
+import com.palmergames.bukkit.towny.TownyUniverse;
import com.palmergames.bukkit.towny.exceptions.AlreadyRegisteredException;
import com.palmergames.bukkit.towny.exceptions.NotRegisteredException;
import com.palmergames.bukkit.towny.object.Resident;
-import com.palmergames.bukkit.towny.object.TownyUniverse;
import org.bukkit.Bukkit;
/**
@@ -41,7 +41,7 @@ public class TownyComponent extends Component {
TBMCCoreAPI.sendDebugMessage("Target resident name is already in use.");
} else
try {
- TownyUniverse.getDataSource().renamePlayer(resident, newName); //Fixed in Towny 0.91.1.2
+ tu.getDataSource().renamePlayer(resident, newName); //Fixed in Towny 0.91.1.2
} catch (AlreadyRegisteredException e) {
TBMCCoreAPI.SendException("Failed to rename resident, there's already one with this name.", e);
} catch (NotRegisteredException e) {
diff --git a/ButtonCore/src/main/java/buttondevteam/lib/TBMCDebugMessageEvent.java b/ButtonCore/src/main/java/buttondevteam/lib/TBMCDebugMessageEvent.java
index d2cbbdf..36154c2 100755
--- a/ButtonCore/src/main/java/buttondevteam/lib/TBMCDebugMessageEvent.java
+++ b/ButtonCore/src/main/java/buttondevteam/lib/TBMCDebugMessageEvent.java
@@ -1,5 +1,6 @@
package buttondevteam.lib;
+import org.bukkit.Bukkit;
import org.bukkit.event.Event;
import org.bukkit.event.HandlerList;
@@ -9,6 +10,7 @@ public class TBMCDebugMessageEvent extends Event {
private boolean sent;
public TBMCDebugMessageEvent(String message) {
+ super(!Bukkit.isPrimaryThread());
this.message = message;
}