Merge branch 'develop' of https://github.com/BentoBoxWorld/Warps.git into develop
This commit is contained in:
commit
ccc1f9c849
|
@ -3,8 +3,7 @@ sudo: false
|
||||||
addons:
|
addons:
|
||||||
sonarcloud:
|
sonarcloud:
|
||||||
organization: "bentobox-world"
|
organization: "bentobox-world"
|
||||||
token:
|
|
||||||
secure: $SONAR_TOKEN
|
|
||||||
jdk:
|
jdk:
|
||||||
- openjdk8
|
- openjdk8
|
||||||
- openjdk11
|
- openjdk11
|
||||||
|
|
2
pom.xml
2
pom.xml
|
@ -66,7 +66,7 @@
|
||||||
<!-- Do not change unless you want different name for local builds. -->
|
<!-- Do not change unless you want different name for local builds. -->
|
||||||
<build.number>-LOCAL</build.number>
|
<build.number>-LOCAL</build.number>
|
||||||
<!-- This allows to change between versions. -->
|
<!-- This allows to change between versions. -->
|
||||||
<build.version>1.8.1</build.version>
|
<build.version>1.8.2</build.version>
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
<!-- Profiles will allow to automatically change build version. -->
|
<!-- Profiles will allow to automatically change build version. -->
|
||||||
|
|
|
@ -83,7 +83,7 @@ public class Warp extends Addon {
|
||||||
// Save default config.yml
|
// Save default config.yml
|
||||||
this.saveDefaultConfig();
|
this.saveDefaultConfig();
|
||||||
// Load the plugin's config
|
// Load the plugin's config
|
||||||
if (this.loadSettings()) {
|
if (this.loadSettings() && settings.isAllowInOtherWorlds()) {
|
||||||
// Load the master warp and warps command
|
// Load the master warp and warps command
|
||||||
new WarpCommand(this);
|
new WarpCommand(this);
|
||||||
new WarpsCommand(this);
|
new WarpsCommand(this);
|
||||||
|
|
Loading…
Reference in New Issue