Merge branch '1.13' into 1.13-items

.travis.yml

@@ -0,0 +1,23 @@
+language: java
+
+branches:
+  only:
+  - 2.x
+  - 1.13
+  
+cache:
+  directories:
+  - .buildtools
+  - $HOME/.m2
+
+before_install:
+  - mkdir -p .buildtools
+  - cd .buildtools
+  - wget -O BuildTools.jar https://hub.spigotmc.org/jenkins/job/BuildTools/lastSuccessfulBuild/artifact/target/BuildTools.jar
+  - rm -r work/
+  - java -jar BuildTools.jar --rev 1.8
+  - java -jar BuildTools.jar --rev 1.8.3
+  - java -jar BuildTools.jar --rev 1.9
+  - java -jar BuildTools.jar --rev 1.9.4
+  - java -jar BuildTools.jar --rev 1.13.1
+  - cd ..

Essentials/src/com/earth2me/essentials/Mob.java

@@ -80,7 +80,7 @@ public enum Mob {
     COD("Cod", Enemies.NEUTRAL, "COD"),
     SALMON("Salmon", Enemies.NEUTRAL, "SALMON"),
     PUFFERFISH("Pufferfish", Enemies.NEUTRAL, "PUFFERFISH"),
-    TROPICAL_FISH("Tropical Fish", Enemies.NEUTRAL, "TROPICAL_FISH"),
+    TROPICAL_FISH("TropicalFish", Enemies.NEUTRAL, "TROPICAL_FISH"),
     DROWNED("Drowned", Enemies.ENEMY, "DROWNED"),
     DOLPHIN("Dolphin", Enemies.NEUTRAL, "DOLPHIN"),
     ;

Essentials/src/com/earth2me/essentials/OfflinePlayer.java

@@ -147,6 +147,10 @@ public class OfflinePlayer implements Player {
         return -1;
     }
 
+    public BlockFace getFacing() {
+        return null;
+    }
+
     @Override
     public boolean performCommand(String string) {
         return false;

Essentials/src/com/earth2me/essentials/commands/Commandnick.java

@@ -75,7 +75,7 @@ public class Commandnick extends EssentialsLoopCommand {
 
     private String formatNickname(final User user, final String nick) throws Exception {
         String newNick = user == null ? FormatUtil.replaceFormat(nick) : FormatUtil.formatString(user, "essentials.nick", nick);
-        if (!newNick.matches("^[a-zA-Z_0-9\u00a7]+$")) {
+        if (!newNick.matches("^[a-zA-Z_0-9\u00a7]+$") && user != null && !user.isAuthorized("essentials.nick.allowunsafe")) {
             throw new Exception(tl("nickNamesAlpha"));
         } else if (getNickLength(newNick) > ess.getSettings().getMaxNickLength()) {
             throw new Exception(tl("nickTooLong"));