diff --git a/htmlcleaner-2.16.jar b/htmlcleaner-2.16.jar
deleted file mode 100644
index 75dc35f..0000000
Binary files a/htmlcleaner-2.16.jar and /dev/null differ
diff --git a/htmlcleaner_licence.txt b/htmlcleaner_licence.txt
deleted file mode 100644
index a7c2554..0000000
--- a/htmlcleaner_licence.txt
+++ /dev/null
@@ -1,35 +0,0 @@
-Copyright (c) 2006-2015, the HTMLCleaner project
-All rights reserved.
-
-Redistribution and use of this software in source and binary forms,
-with or without modification, are permitted provided that the following
-conditions are met:
-
-* Redistributions of source code must retain the above
- copyright notice, this list of conditions and the
- following disclaimer.
-
-* Redistributions in binary form must reproduce the above
- copyright notice, this list of conditions and the
- following disclaimer in the documentation and/or other
- materials provided with the distribution.
-
-* The name of HtmlCleaner may not be used to endorse or promote
- products derived from this software without specific prior
- written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
-
-You can contact Vladimir Nikic by sending e-mail to
-nikic_vladimir@yahoo.com. Please include the word "HtmlCleaner" in the
-subject line.
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 0b286e4..bc2381c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -36,14 +36,12 @@
-
- classworlds:classworlds
- junit:junit
- jmock:*
- *:xml-apis
- org.apache.maven:lib:tests
- log4j:log4j:jar:
-
+
+ htmlcleaner
+
+
+ reflections
+
@@ -66,6 +64,24 @@
jitpack.io
https://jitpack.io/
+
+ Essentials
+ http://repo.ess3.net/
+
+
+ Votifier
+ http://repo.howaner.de/
+
+
+ Minigames
+ http://maven.addstar.com.au/artifactory/release
+
+
+ vault-repo
+ http://nexus.hc.to/content/repositories/pub_releases
+
+
@@ -84,6 +100,44 @@
ButtonCore
master-SNAPSHOT
+
+
+ net.sourceforge.htmlcleaner
+ htmlcleaner
+ 2.16
+
+
+
+ org.reflections
+ reflections
+ 0.9.10
+
+
+ net.ess3
+ Essentials
+ 2.13.1
+
+
+ com.github.TBMCPlugins.ButtonCore
+ Towny
+ master-SNAPSHOT
+
+
+ com.vexsoftware
+ votifier
+ 1.9
+
+
+ au.com.mineauz
+ Minigames
+ 1.8.0
+
+
+ net.milkbowl.vault
+ VaultAPI
+ 1.6
+ provided
+
ButtonChat
diff --git a/reflections-0.9.10.jar b/reflections-0.9.10.jar
deleted file mode 100644
index c255641..0000000
Binary files a/reflections-0.9.10.jar and /dev/null differ
diff --git a/src/buttondevteam/chat/PlayerListener.java b/src/buttondevteam/chat/PlayerListener.java
index 8231886..3a2e711 100644
--- a/src/buttondevteam/chat/PlayerListener.java
+++ b/src/buttondevteam/chat/PlayerListener.java
@@ -344,13 +344,10 @@ public class PlayerListener implements Listener {
return;
}
} else if (cmd.equalsIgnoreCase("home") || cmd.equalsIgnoreCase("tpa") || cmd.equalsIgnoreCase("tp")) {
- MinigamePlayer mgp = Minigames.plugin.pdata.getMinigamePlayer(event.getPlayer());
String currentWorld = event.getPlayer().getLocation().getWorld().getName();
Location currentLocation = event.getPlayer().getLocation();
TownyUniverse universe = Towny.getPlugin(Towny.class).getTownyUniverse();
- if (mgp.isInMinigame() && mgp.getMinigame().getMechanic().getMechanic().equals("creativeglobal")) {
- mgp.setAllowTeleport(true);
- } else if (TownyUniverse.isWarTime()) {
+ if (TownyUniverse.isWarTime()) {
War war = universe.getWarEvent();
if (war.isWarZone(
new WorldCoord(currentWorld, currentLocation.getBlockX(), currentLocation.getBlockZ()))) {
diff --git a/src/buttondevteam/chat/PluginMain.java b/src/buttondevteam/chat/PluginMain.java
index 886658a..93cdf1b 100644
--- a/src/buttondevteam/chat/PluginMain.java
+++ b/src/buttondevteam/chat/PluginMain.java
@@ -66,7 +66,7 @@ public class PluginMain extends JavaPlugin { // Translated to Java: 2015.07.15.
@Override
public void onEnable() {
Instance = this;
- try {
+ /*try {
PluginMain.Instance.getLogger().info("Extracting necessary libraries...");
final File[] libs = new File[] { new File(getDataFolder(), "htmlcleaner-2.16.jar"),
new File(getDataFolder(), "reflections-0.9.10.jar"),
@@ -86,7 +86,7 @@ public class PluginMain extends JavaPlugin { // Translated to Java: 2015.07.15.
}
} catch (final Exception e) {
e.printStackTrace();
- }
+ }*/
getServer().getPluginManager().registerEvents(new PlayerListener(), this);
CommandCaller.RegisterChatCommands(this);