diff --git a/Changelog.txt b/Changelog.txt
index 37f4505..d40372a 100644
--- a/Changelog.txt
+++ b/Changelog.txt
@@ -7,6 +7,9 @@ Key:
! Change
- Removal
+Version 1.0.2
+ + Prevent Hardcore/Vampirism features inside of Towny Arena Plots.
+
Version 1.0.1
= Fix error spam seen when used with new mcMMO builds (possible 2.* related.)
= Fix use of deprecated Towny API call, switched new TownyAPI.
diff --git a/README.md b/README.md
index 0597445..aa499e3 100644
--- a/README.md
+++ b/README.md
@@ -33,9 +33,4 @@ mcMMO is currently developed by a team of individuals from all over the world.
mcMMO uses Maven 3 to manage dependencies, packaging, and shading of necessary classes; Maven 3 is required to compile mcMMO.
-The typical command used to build mcMMO is: `mvn clean package install`
-
-Required Libraries:
-* Bukkit
-* mcMMO
-* Towny
+The typical command used to build mcMMO is: `mvn clean package install`
\ No newline at end of file
diff --git a/lib/Towny.jar b/lib/Towny.jar
deleted file mode 100644
index 686e1ca..0000000
Binary files a/lib/Towny.jar and /dev/null differ
diff --git a/pom.xml b/pom.xml
index 30b489f..69d50c6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
4.0.0
org.mcmmo
mcMMO-Towny
- 1.0.1
+ 1.0.2
mcMMO-Towny
https://github.com/mcMMO-Dev/mcMMO-Towny
@@ -24,27 +24,37 @@
+
+
+ spigot-repo
+ https://hub.spigotmc.org/nexus/content/repositories/snapshots/
+
+
+ glaremasters repo
+ https://repo.glaremasters.me/repository/towny/
+
+
+ mcmmo-repo
+ https://nexus.neetgames.com/repository/maven-public
+
+
- org.bukkit
- bukkit
+ org.spigotmc
+ spigot-api
1.14.4-R0.1-SNAPSHOT
- system
- ${project.basedir}\lib\bukkit.jar
+ provided
- com.gmail.nossr50.mcMMO
- mcMMO
- 2.1.107
- system
- ${project.basedir}\lib\mcMMO.jar
+ com.palmergames.bukkit.towny
+ Towny
+ 0.98.3.0
+ provided
- com.palmergames
- Towny
- 0.94.0.8
- system
- ${project.basedir}\lib\Towny.jar
+ com.gmail.nossr50.mcMMO
+ mcMMO
+ 2.1.209
diff --git a/src/main/java/org/mcmmo/mcmmotowny/listeners/ExperienceListener.java b/src/main/java/org/mcmmo/mcmmotowny/listeners/ExperienceListener.java
index 841b96f..4812a2a 100644
--- a/src/main/java/org/mcmmo/mcmmotowny/listeners/ExperienceListener.java
+++ b/src/main/java/org/mcmmo/mcmmotowny/listeners/ExperienceListener.java
@@ -6,7 +6,13 @@
import org.bukkit.event.Listener;
import com.gmail.nossr50.events.experience.McMMOPlayerXpGainEvent;
+import com.gmail.nossr50.events.hardcore.McMMOPlayerDeathPenaltyEvent;
+import com.gmail.nossr50.events.hardcore.McMMOPlayerStatLossEvent;
+import com.gmail.nossr50.events.hardcore.McMMOPlayerVampirismEvent;
import com.palmergames.bukkit.towny.TownyAPI;
+import com.palmergames.bukkit.towny.object.TownBlock;
+import com.palmergames.bukkit.towny.object.TownBlockType;
+
import org.mcmmo.mcmmotowny.config.Config;
public class ExperienceListener implements Listener {
@@ -36,4 +42,25 @@ private boolean isAffectedSkill(String skillName) {
private boolean isAffectedReason(String xpGainReason) {
return Config.getInstance().getAffectedXpGainReasons().contains(xpGainReason);
}
+
+ @EventHandler
+ public void onHardcoreDeath(McMMOPlayerDeathPenaltyEvent event) {
+ TownBlock townBlock = TownyAPI.getInstance().getTownBlock(event.getPlayer().getLocation());
+ if (townBlock != null && townBlock.getType().equals(TownBlockType.ARENA))
+ event.setCancelled(true);
+ }
+
+ @EventHandler
+ public void onStatLoss(McMMOPlayerStatLossEvent event) {
+ TownBlock townBlock = TownyAPI.getInstance().getTownBlock(event.getPlayer().getLocation());
+ if (townBlock != null && townBlock.getType().equals(TownBlockType.ARENA))
+ event.setCancelled(true);
+ }
+
+ @EventHandler
+ public void onVampirism(McMMOPlayerVampirismEvent event) {
+ TownBlock townBlock = TownyAPI.getInstance().getTownBlock(event.getPlayer().getLocation());
+ if (townBlock != null && townBlock.getType().equals(TownBlockType.ARENA))
+ event.setCancelled(true);
+ }
}
diff --git a/src/main/java/org/mcmmo/mcmmotowny/mcMMOTowny.java b/src/main/java/org/mcmmo/mcmmotowny/mcMMOTowny.java
index c837f72..23fb5e8 100644
--- a/src/main/java/org/mcmmo/mcmmotowny/mcMMOTowny.java
+++ b/src/main/java/org/mcmmo/mcmmotowny/mcMMOTowny.java
@@ -32,7 +32,7 @@ public void onEnable() {
}
if (!isTownyEnabled()) {
- this.getLogger().warning("mcMMO-Towny requires Towny to run, please download Towny. http://palmergames.com/towny/");
+ this.getLogger().warning("mcMMO-Towny requires Towny to run, please download Towny. https://townyadvanced.github.io");
getServer().getPluginManager().disablePlugin(this);
return;
}