Upstream/Essentials
1
0
Fork 0
mirror of https://github.com/EssentialsX/Essentials.git synced 2024-12-23 17:47:34 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch '1.13' into 1.13-items

Browse Source
This commit is contained in:
md678685 2018-10-13 16:59:57 +01:00
commit 6906ef2154
4 changed files with 29 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
.travis.yml Normal file
View File

@ -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 ..

2
Essentials/src/com/earth2me/essentials/Mob.java
View File

@ -80,7 +80,7 @@ public enum Mob {
COD("Cod", Enemies.NEUTRAL, "COD"), COD("Cod", Enemies.NEUTRAL, "COD"),
SALMON("Salmon", Enemies.NEUTRAL, "SALMON"), SALMON("Salmon", Enemies.NEUTRAL, "SALMON"),
PUFFERFISH("Pufferfish", Enemies.NEUTRAL, "PUFFERFISH"), 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"), DROWNED("Drowned", Enemies.ENEMY, "DROWNED"),
DOLPHIN("Dolphin", Enemies.NEUTRAL, "DOLPHIN"), DOLPHIN("Dolphin", Enemies.NEUTRAL, "DOLPHIN"),
; ;

4
Essentials/src/com/earth2me/essentials/OfflinePlayer.java
View File

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

2
Essentials/src/com/earth2me/essentials/commands/Commandnick.java
View File

@ -75,7 +75,7 @@ public class Commandnick extends EssentialsLoopCommand {
private String formatNickname(final User user, final String nick) throws Exception { private String formatNickname(final User user, final String nick) throws Exception {
String newNick = user == null ? FormatUtil.replaceFormat(nick) : FormatUtil.formatString(user, "essentials.nick", nick); 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")); throw new Exception(tl("nickNamesAlpha"));
} else if (getNickLength(newNick) > ess.getSettings().getMaxNickLength()) { } else if (getNickLength(newNick) > ess.getSettings().getMaxNickLength()) {
throw new Exception(tl("nickTooLong")); throw new Exception(tl("nickTooLong"));