diff --git a/mvn-repo/com/massivecraft/Factions/1.6.9.5-U0.2.1-RC-1.5-BETA/Factions-1.6.9.5-U0.2.1-RC-1.5-BETA.jar b/mvn-repo/com/massivecraft/Factions/1.6.9.5-U0.2.1-RC-1.5-BETA/Factions-1.6.9.5-U0.2.1-RC-1.5-BETA.jar
index 332f36f6..6766be0c 100644
Binary files a/mvn-repo/com/massivecraft/Factions/1.6.9.5-U0.2.1-RC-1.5-BETA/Factions-1.6.9.5-U0.2.1-RC-1.5-BETA.jar and b/mvn-repo/com/massivecraft/Factions/1.6.9.5-U0.2.1-RC-1.5-BETA/Factions-1.6.9.5-U0.2.1-RC-1.5-BETA.jar differ
diff --git a/mvn-repo/com/massivecraft/Factions/1.6.9.5-U0.2.1-RC-1.5-BETA/Factions-1.6.9.5-U0.2.1-RC-1.5-BETA.jar.md5 b/mvn-repo/com/massivecraft/Factions/1.6.9.5-U0.2.1-RC-1.5-BETA/Factions-1.6.9.5-U0.2.1-RC-1.5-BETA.jar.md5
index 653eb80a..c587ad54 100644
--- a/mvn-repo/com/massivecraft/Factions/1.6.9.5-U0.2.1-RC-1.5-BETA/Factions-1.6.9.5-U0.2.1-RC-1.5-BETA.jar.md5
+++ b/mvn-repo/com/massivecraft/Factions/1.6.9.5-U0.2.1-RC-1.5-BETA/Factions-1.6.9.5-U0.2.1-RC-1.5-BETA.jar.md5
@@ -1 +1 @@
-0f1b5a7d6e7451e0a606fb9c2fd7b145
\ No newline at end of file
+3b1334c41e3a7fab70a4b9dedf3d2d6a
\ No newline at end of file
diff --git a/mvn-repo/com/massivecraft/Factions/1.6.9.5-U0.2.1-RC-1.5-BETA/Factions-1.6.9.5-U0.2.1-RC-1.5-BETA.jar.sha1 b/mvn-repo/com/massivecraft/Factions/1.6.9.5-U0.2.1-RC-1.5-BETA/Factions-1.6.9.5-U0.2.1-RC-1.5-BETA.jar.sha1
index 95b9e979..ee6448a8 100644
--- a/mvn-repo/com/massivecraft/Factions/1.6.9.5-U0.2.1-RC-1.5-BETA/Factions-1.6.9.5-U0.2.1-RC-1.5-BETA.jar.sha1
+++ b/mvn-repo/com/massivecraft/Factions/1.6.9.5-U0.2.1-RC-1.5-BETA/Factions-1.6.9.5-U0.2.1-RC-1.5-BETA.jar.sha1
@@ -1 +1 @@
-8a29df1b0bc844eb5098615c5d69febaefb50356
\ No newline at end of file
+9f456511cf3dddd2d238d9f12e3ebc0dc00e02f8
\ No newline at end of file
diff --git a/mvn-repo/com/massivecraft/Factions/1.6.9.5-U0.2.1-RC-1.5-BETA/Factions-1.6.9.5-U0.2.1-RC-1.5-BETA.pom b/mvn-repo/com/massivecraft/Factions/1.6.9.5-U0.2.1-RC-1.5-BETA/Factions-1.6.9.5-U0.2.1-RC-1.5-BETA.pom
index dc81c2f7..3563b23f 100644
--- a/mvn-repo/com/massivecraft/Factions/1.6.9.5-U0.2.1-RC-1.5-BETA/Factions-1.6.9.5-U0.2.1-RC-1.5-BETA.pom
+++ b/mvn-repo/com/massivecraft/Factions/1.6.9.5-U0.2.1-RC-1.5-BETA/Factions-1.6.9.5-U0.2.1-RC-1.5-BETA.pom
@@ -7,14 +7,16 @@
1.6.9.5-U0.2.1-RC-1.5-BETA
jar
- Factions
+ SavageFactions
UTF-8
+ ${maven.build.timestamp}
+ yyyy-MM-dd--HH-mm
- clean package install
+ clean install deploy
${project.name}
src/main/java
@@ -67,7 +69,7 @@
maven-jar-plugin
2.3.2
- SavageFactions-${project.version}
+ Factions-${maven.build.timestamp}
diff --git a/mvn-repo/com/massivecraft/Factions/1.6.9.5-U0.2.1-RC-1.5-BETA/Factions-1.6.9.5-U0.2.1-RC-1.5-BETA.pom.md5 b/mvn-repo/com/massivecraft/Factions/1.6.9.5-U0.2.1-RC-1.5-BETA/Factions-1.6.9.5-U0.2.1-RC-1.5-BETA.pom.md5
index e2b98c80..2aa9c077 100644
--- a/mvn-repo/com/massivecraft/Factions/1.6.9.5-U0.2.1-RC-1.5-BETA/Factions-1.6.9.5-U0.2.1-RC-1.5-BETA.pom.md5
+++ b/mvn-repo/com/massivecraft/Factions/1.6.9.5-U0.2.1-RC-1.5-BETA/Factions-1.6.9.5-U0.2.1-RC-1.5-BETA.pom.md5
@@ -1 +1 @@
-471dc814a99accc66a38e056aafa2177
\ No newline at end of file
+17e6839e0ff447492c6ae777ccc92e4c
\ No newline at end of file
diff --git a/mvn-repo/com/massivecraft/Factions/1.6.9.5-U0.2.1-RC-1.5-BETA/Factions-1.6.9.5-U0.2.1-RC-1.5-BETA.pom.sha1 b/mvn-repo/com/massivecraft/Factions/1.6.9.5-U0.2.1-RC-1.5-BETA/Factions-1.6.9.5-U0.2.1-RC-1.5-BETA.pom.sha1
index 3cf25445..ef5e7ec3 100644
--- a/mvn-repo/com/massivecraft/Factions/1.6.9.5-U0.2.1-RC-1.5-BETA/Factions-1.6.9.5-U0.2.1-RC-1.5-BETA.pom.sha1
+++ b/mvn-repo/com/massivecraft/Factions/1.6.9.5-U0.2.1-RC-1.5-BETA/Factions-1.6.9.5-U0.2.1-RC-1.5-BETA.pom.sha1
@@ -1 +1 @@
-dceab45df9107b8d8db6241a89085aeefec56875
\ No newline at end of file
+c550860888ccd4d325e3603fb0302deb07c22c72
\ No newline at end of file
diff --git a/mvn-repo/com/massivecraft/Factions/maven-metadata.xml b/mvn-repo/com/massivecraft/Factions/maven-metadata.xml
index 2e74dd50..1a5a3743 100644
--- a/mvn-repo/com/massivecraft/Factions/maven-metadata.xml
+++ b/mvn-repo/com/massivecraft/Factions/maven-metadata.xml
@@ -7,6 +7,6 @@
1.6.9.5-U0.2.1-RC-1.5-BETA
- 20181216050532
+ 20181220220357
diff --git a/mvn-repo/com/massivecraft/Factions/maven-metadata.xml.md5 b/mvn-repo/com/massivecraft/Factions/maven-metadata.xml.md5
index 2dfb8e5b..4050806a 100644
--- a/mvn-repo/com/massivecraft/Factions/maven-metadata.xml.md5
+++ b/mvn-repo/com/massivecraft/Factions/maven-metadata.xml.md5
@@ -1 +1 @@
-2a0616ebd85fb1a3a6550ebdc45182fc
\ No newline at end of file
+2446c2ce3e973dde08e0d246410e2cd0
\ No newline at end of file
diff --git a/mvn-repo/com/massivecraft/Factions/maven-metadata.xml.sha1 b/mvn-repo/com/massivecraft/Factions/maven-metadata.xml.sha1
index 01b03203..fd06071c 100644
--- a/mvn-repo/com/massivecraft/Factions/maven-metadata.xml.sha1
+++ b/mvn-repo/com/massivecraft/Factions/maven-metadata.xml.sha1
@@ -1 +1 @@
-f48e4510711a6a15700754850c9707d07299b253
\ No newline at end of file
+fc6e25aaeb2ec2b3581075cd2bfc657ada82045d
\ No newline at end of file
diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdTnt.java b/src/main/java/com/massivecraft/factions/cmd/CmdTnt.java
index 65d71644..7c858339 100644
--- a/src/main/java/com/massivecraft/factions/cmd/CmdTnt.java
+++ b/src/main/java/com/massivecraft/factions/cmd/CmdTnt.java
@@ -98,7 +98,7 @@ public class CmdTnt extends FCommand {
return;
}
if (fme.getFaction().getTnt() < amount) {
- fme.msg(TL.COMMAND_TNT_WIDTHDRAW_NOTENOUGH);
+ fme.msg(TL.COMMAND_TNT_WIDTHDRAW_NOTENOUGH.toString());
return;
}
int fullStacks = amount / 64;
diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdTntFill.java b/src/main/java/com/massivecraft/factions/cmd/CmdTntFill.java
index c7287918..407c815f 100644
--- a/src/main/java/com/massivecraft/factions/cmd/CmdTntFill.java
+++ b/src/main/java/com/massivecraft/factions/cmd/CmdTntFill.java
@@ -47,11 +47,11 @@ public class CmdTntFill extends FCommand {
int radius = argAsInt(0, 16);
int amount = argAsInt(1, 16);
if (radius > SavageFactions.plugin.getConfig().getInt("Tntfill.max-radius")) {
- msg(TL.COMMAND_TNTFILL_RADIUSMAX.toString().replace("{max}", SavageFactions.plugin.getConfig().getInt("Tntfill.max-radius") + ""));
+ fme.msg(TL.COMMAND_TNTFILL_RADIUSMAX.toString().replace("{max}", SavageFactions.plugin.getConfig().getInt("Tntfill.max-radius") + ""));
return;
}
if (amount > SavageFactions.plugin.getConfig().getInt("Tntfill.max-amount")) {
- msg(TL.COMMAND_TNTFILL_AMOUNTMAX.toString().replace("{max}", SavageFactions.plugin.getConfig().getInt("Tntfill.max-amount") + ""));
+ fme.msg(TL.COMMAND_TNTFILL_AMOUNTMAX.toString().replace("{max}", SavageFactions.plugin.getConfig().getInt("Tntfill.max-amount") + ""));
return;
}
@@ -80,7 +80,7 @@ public class CmdTntFill extends FCommand {
int remainderAmt = amount % 64;
if (!inventoryContains(me.getInventory(), new ItemStack(Material.TNT, amount))) {
if (!fme.getRole().isAtLeast(Role.MODERATOR)) {
- msg(TL.COMMAND_TNTFILL_NOTENOUGH);
+ fme.msg(TL.COMMAND_TNTFILL_NOTENOUGH.toString());
sendMessage(TL.COMMAND_TNTFILL_SUCCESS.toString().replace("{amount}", amount + "").replace("{dispensers}", counter + ""));
me.updateInventory();
return;
@@ -89,7 +89,7 @@ public class CmdTntFill extends FCommand {
bankMode = true;
removeFromBank(amount);
if (!inventoryContains(me.getInventory(), new ItemStack(Material.TNT, amount))) {
- msg(TL.COMMAND_TNTFILL_NOTENOUGH);
+ fme.msg(TL.COMMAND_TNTFILL_NOTENOUGH.toString());
sendMessage(TL.COMMAND_TNTFILL_SUCCESS.toString().replace("{amount}", amount + "").replace("{dispensers}", counter + ""));
me.updateInventory();
return;
@@ -135,17 +135,17 @@ public class CmdTntFill extends FCommand {
return;
}
if (fme.getFaction().getTnt() < amount) {
- fme.msg(TL.COMMAND_TNT_WIDTHDRAW_NOTENOUGH);
+ fme.msg(TL.COMMAND_TNT_WIDTHDRAW_NOTENOUGH.toString());
return;
}
int fullStacks = amount / 64;
int remainderAmt = amount % 64;
if ((remainderAmt == 0 && getEmptySlots(me) <= fullStacks)) {
- fme.msg(TL.COMMAND_TNT_WIDTHDRAW_NOTENOUGH);
+ fme.msg(TL.COMMAND_TNT_WIDTHDRAW_NOTENOUGH.toString());
return;
}
if (getEmptySlots(me) + 1 <= fullStacks) {
- fme.msg(TL.COMMAND_TNT_WIDTHDRAW_NOTENOUGH);
+ fme.msg(TL.COMMAND_TNT_WIDTHDRAW_NOTENOUGH.toString());
return;
}
ItemStack tnt64 = new ItemStack(Material.TNT, 64);
@@ -190,7 +190,7 @@ public class CmdTntFill extends FCommand {
return false;
}
if (getEmptySlots(me) + 1 <= fullStacks) {
- fme.msg(TL.COMMAND_TNT_WIDTHDRAW_NOTENOUGH);
+ fme.msg(TL.COMMAND_TNT_WIDTHDRAW_NOTENOUGH.toString());
return false;
}
return true;
diff --git a/src/main/java/com/massivecraft/factions/zcore/fperms/PermissableAction.java b/src/main/java/com/massivecraft/factions/zcore/fperms/PermissableAction.java
index 084dfe76..a7fe22ea 100644
--- a/src/main/java/com/massivecraft/factions/zcore/fperms/PermissableAction.java
+++ b/src/main/java/com/massivecraft/factions/zcore/fperms/PermissableAction.java
@@ -52,7 +52,7 @@ public enum PermissableAction {
* Case insensitive check for action.
*
* @param check
- * @return
+ * @return - action
*/
public static PermissableAction fromString(String check) {
for (PermissableAction permissableAction : values()) {
diff --git a/src/main/java/com/massivecraft/factions/zcore/util/TagUtil.java b/src/main/java/com/massivecraft/factions/zcore/util/TagUtil.java
index af074326..53ff5f63 100644
--- a/src/main/java/com/massivecraft/factions/zcore/util/TagUtil.java
+++ b/src/main/java/com/massivecraft/factions/zcore/util/TagUtil.java
@@ -84,7 +84,7 @@ public class TagUtil {
* @param faction for faction (viewers faction)
* @param fme for player (viewer)
* @param line fancy message prefix
- * @return
+ * @return list of fancy msgs
*/
public static List parseFancy(Faction faction, FPlayer fme, String line) {
for (TagReplacer tagReplacer : TagReplacer.getByType(TagType.FANCY)) {