summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMinenash <minenash@protonmail.com>2019-01-30 20:46:44 -0500
committerMinenash <minenash@protonmail.com>2019-01-30 20:46:44 -0500
commit91783efc87fe511190b54d35d92e90f703b1aeea (patch)
tree8bc2a08c848f1d19fde257961a9a8f35e4f294df
parent39b8dbe4179a679226d4099a5ae3aba312ad90b4 (diff)
parentf02d7b37537dcc50a84183c60c4defc4f994d954 (diff)
Merge branch 'dev' of https://github.com/RedstonerServer/Modules.git into dev
-rw-r--r--.travis.yml2
-rw-r--r--src/main/java/com/redstoner/modules/lagchunks/LagChunks.cmd6
2 files changed, 4 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml
index 7c7ca10..1ff7c59 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,6 @@
---
before_script:
- - "build=true;for file in $(find . -name \"*.java\");do module_scan=$(grep -E \"public +(final +)?class +\\w+ +(extends +.* +)?implements +(\\w+, *)?Module\" \"$file\");if [ -z \"$module_scan\" ];then continue;fi;diff=$(git diff master \"$file\");if [ ! -z \"$diff\" ];then scanned=$(echo \"$x\" | grep \"@Version\");if [ -z \"$scanned\" ];then echo -e \"Found modified module with unchanged version number $file\";build=false;fi;fi;done;if ! $build;then echo -e \"Found one or more unchanged version numbers. Failing build.\";exit 1;fi"
+# - "build=true;for file in $(find . -name \"*.java\");do module_scan=$(grep -E \"public +(final +)?class +\\w+ +(extends +.* +)?implements +(\\w+, *)?Module\" \"$file\");if [ -z \"$module_scan\" ];then continue;fi;diff=$(git diff master \"$file\");if [ ! -z \"$diff\" ];then scanned=$(echo \"$x\" | grep \"@Version\");if [ -z \"$scanned\" ];then echo -e \"Found modified module with unchanged version number $file\";build=false;fi;fi;done;if ! $build;then echo -e \"Found one or more unchanged version numbers. Failing build.\";exit 1;fi"
- "if find . -name \"*.java\" | xargs grep \"System.out.print\"; then echo \"Found one or more direct prints to console. Failing build.\"; exit 1; fi;"
jdk:
- openjdk8
diff --git a/src/main/java/com/redstoner/modules/lagchunks/LagChunks.cmd b/src/main/java/com/redstoner/modules/lagchunks/LagChunks.cmd
index 0426952..da70816 100644
--- a/src/main/java/com/redstoner/modules/lagchunks/LagChunks.cmd
+++ b/src/main/java/com/redstoner/modules/lagchunks/LagChunks.cmd
@@ -4,17 +4,17 @@ command lc {
list {
run list_cmd;
- help re-lists already scanned chunks;
+ help Re-lists already scanned chunks.;
}
[int:amount] {
run scan_cmd amount;
- help scans for laggy chunks;
+ help Scans for laggy chunks.;
}
tp [int:number] {
run tp number;
- help teleports to the specified chunk;
+ help Teleports to the specified chunk.;
type player;
}
}