diff --git a/TotalFreedomMod.iml b/TotalFreedomMod.iml
index 8f727c3b..272d131b 100644
--- a/TotalFreedomMod.iml
+++ b/TotalFreedomMod.iml
@@ -10,10 +10,8 @@
-
-
@@ -46,32 +44,26 @@
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
\ No newline at end of file
diff --git a/lib/WorldEdit.jar b/lib/WorldEdit.jar
deleted file mode 100644
index 975ff50d..00000000
Binary files a/lib/WorldEdit.jar and /dev/null differ
diff --git a/pom.xml b/pom.xml
index 5179d298..60b20ebd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,12 +10,7 @@
UTF-8
- ${project.version}
God
- ${maven.buildnumber}
- ${maven.build.timestamp}
- ${buildAuthor}
- ${git.commit.id.abbrev}
${project.name}
${maven.build.timestamp}
MM/dd/yyyy HH:mm
@@ -139,24 +134,6 @@
provided
-
- com.github.TFPatches
- TF-WorldEdit
- 2e79570525
- provided
-
-
-
-
- com.sk89q.worldedit
- worldedit-bukkit
- 7.0.0-SNAPSHOT
- system
- ${project.basedir}/lib/WorldEdit.jar
-
-
net.ess3
Essentials
@@ -167,14 +144,14 @@
org.bukkit
craftbukkit
- 1.13-R0.1-SNAPSHOT
+ 1.13.1-R0.1-SNAPSHOT
provided
net.dv8tion
JDA
- 3.7.1_385
+ 3.8.0_423
provided
@@ -220,7 +197,7 @@
pl.project13.maven
git-commit-id-plugin
- 2.2.4
+ 2.2.5
get-the-git-infos
diff --git a/src/main/java/me/totalfreedom/totalfreedommod/blocking/MobBlocker.java b/src/main/java/me/totalfreedom/totalfreedommod/blocking/MobBlocker.java
index abf40a00..dec8de7c 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/blocking/MobBlocker.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/blocking/MobBlocker.java
@@ -3,6 +3,7 @@ package me.totalfreedom.totalfreedommod.blocking;
import me.totalfreedom.totalfreedommod.FreedomService;
import me.totalfreedom.totalfreedommod.TotalFreedomMod;
import me.totalfreedom.totalfreedommod.config.ConfigEntry;
+import me.totalfreedom.totalfreedommod.util.FLog;
import org.bukkit.attribute.Attributable;
import org.bukkit.attribute.Attribute;
import org.bukkit.entity.Bat;
@@ -69,6 +70,7 @@ public class MobBlocker extends FreedomService
}
final Entity spawned = event.getEntity();
+
if (spawned instanceof EnderDragon)
{
if (ConfigEntry.MOB_LIMITER_DISABLE_DRAGON.getBoolean())
@@ -100,40 +102,40 @@ public class MobBlocker extends FreedomService
event.setCancelled(true);
return;
}
- else if (spawned instanceof Giant)
- {
- if (ConfigEntry.MOB_LIMITER_DISABLE_GIANT.getBoolean())
- {
- event.setCancelled(true);
- return;
- }
- }
- else if (spawned instanceof Bat)
+ }
+ else if (spawned instanceof Giant)
+ {
+ if (ConfigEntry.MOB_LIMITER_DISABLE_GIANT.getBoolean())
{
event.setCancelled(true);
return;
}
+ }
+ else if (spawned instanceof Bat)
+ {
+ event.setCancelled(true);
+ return;
+ }
- int mobLimiterMax = ConfigEntry.MOB_LIMITER_MAX.getInteger();
+ int mobLimiterMax = ConfigEntry.MOB_LIMITER_MAX.getInteger();
- if (mobLimiterMax <= 0)
+ if (mobLimiterMax <= 0)
+ {
+ return;
+ }
+
+ int mobcount = 0;
+ for (Entity entity : event.getLocation().getWorld().getLivingEntities())
+ {
+ if (!(entity instanceof HumanEntity))
{
- return;
+ mobcount++;
}
+ }
- int mobcount = 0;
- for (Entity entity : event.getLocation().getWorld().getLivingEntities())
- {
- if (!(entity instanceof HumanEntity))
- {
- mobcount++;
- }
- }
-
- if (mobcount > mobLimiterMax)
- {
- event.setCancelled(true);
- }
+ if (mobcount > mobLimiterMax)
+ {
+ event.setCancelled(true);
}
}
}
diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_invis.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_invis.java
index 60baa4f0..fcfa338e 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_invis.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_invis.java
@@ -11,7 +11,7 @@ import org.bukkit.entity.Player;
import org.bukkit.potion.PotionEffectType;
@CommandPermissions(level = Rank.SUPER_ADMIN, source = SourceType.BOTH)
-@CommandParameters(description = "Shows (optionally clears) invisible players", usage = "/ (clear)")
+@CommandParameters(description = "Shows (optionally clears) invisible players", usage = "/ [clear]")
public class Command_invis extends FreedomCommand
{
@Override
diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
index a50c52a0..02856336 100644
--- a/src/main/resources/plugin.yml
+++ b/src/main/resources/plugin.yml
@@ -1,6 +1,6 @@
name: TotalFreedomMod
main: me.totalfreedom.totalfreedommod.TotalFreedomMod
-version: ${tfm.build.version}
+version: ${project.version}
description: Plugin for the Total Freedom server.
depend: [Aero]
softdepend: [BukkitTelnet, Essentials, LibsDisguises, WorldEdit]