File tree Expand file tree Collapse file tree 5 files changed +15
-13
lines changed
src/main/java/world/bentobox/greenhouses/ui/user Expand file tree Collapse file tree 5 files changed +15
-13
lines changed Original file line number Diff line number Diff line change @@ -11,22 +11,22 @@ jobs:
11
11
name : Build
12
12
runs-on : ubuntu-latest
13
13
steps :
14
- - uses : actions/checkout@v3
14
+ - uses : actions/checkout@v4
15
15
with :
16
16
fetch-depth : 0 # Shallow clones should be disabled for a better relevancy of analysis
17
- - name : Set up JDK 17
18
- uses : actions/setup-java@v3
17
+ - name : Set up JDK 21
18
+ uses : actions/setup-java@v4
19
19
with :
20
20
distribution : ' adopt'
21
- java-version : 17
21
+ java-version : 21
22
22
- name : Cache SonarCloud packages
23
- uses : actions/cache@v3
23
+ uses : actions/cache@v4
24
24
with :
25
25
path : ~/.sonar/cache
26
26
key : ${{ runner.os }}-sonar
27
27
restore-keys : ${{ runner.os }}-sonar
28
28
- name : Cache Maven packages
29
- uses : actions/cache@v3
29
+ uses : actions/cache@v4
30
30
with :
31
31
path : ~/.m2
32
32
key : ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
Original file line number Diff line number Diff line change 39
39
<properties >
40
40
<project .build.sourceEncoding>UTF-8</project .build.sourceEncoding>
41
41
<project .reporting.outputEncoding>UTF-8</project .reporting.outputEncoding>
42
- <java .version>17 </java .version>
42
+ <java .version>21 </java .version>
43
43
<powermock .version>2.0.9</powermock .version>
44
44
<!-- More visible way how to change dependency versions -->
45
- <spigot .version>1.21.3 -R0.1-SNAPSHOT</spigot .version>
45
+ <spigot .version>1.21.5 -R0.1-SNAPSHOT</spigot .version>
46
46
<bentobox .version>2.7.1-SNAPSHOT</bentobox .version>
47
47
<!-- Revision variable removes warning about dynamic version -->
48
48
<revision >${build.version}-SNAPSHOT</revision >
49
49
<!-- This allows to change between versions and snapshots. -->
50
- <build .version>1.9.1 </build .version>
50
+ <build .version>1.9.2 </build .version>
51
51
<build .number>-LOCAL</build .number>
52
52
<sonar .projectKey>BentoBoxWorld_Greenhouses</sonar .projectKey>
53
53
<sonar .organization>bentobox-world</sonar .organization>
183
183
<plugin >
184
184
<groupId >org.apache.maven.plugins</groupId >
185
185
<artifactId >maven-compiler-plugin</artifactId >
186
- <version >3.7.0 </version >
186
+ <version >3.8.1 </version >
187
187
<configuration >
188
188
<release >${java.version} </release >
189
189
</configuration >
Original file line number Diff line number Diff line change @@ -51,7 +51,7 @@ public void setup() {
51
51
*/
52
52
@ Override
53
53
public boolean execute (User user , String label , List <String > args ) {
54
- if (!user .getWorld ().equals (getWorld ())) {
54
+ if (!Util . getWorld ( user .getWorld () ).equals (getWorld ())) {
55
55
user .sendMessage ("general.errors.wrong-world" );
56
56
return false ;
57
57
}
Original file line number Diff line number Diff line change 4
4
5
5
import world .bentobox .bentobox .api .commands .CompositeCommand ;
6
6
import world .bentobox .bentobox .api .user .User ;
7
+ import world .bentobox .bentobox .util .Util ;
7
8
import world .bentobox .greenhouses .Greenhouses ;
8
9
9
10
/**
@@ -35,7 +36,7 @@ public void setup() {
35
36
*/
36
37
@ Override
37
38
public boolean execute (User user , String label , List <String > args ) {
38
- if (!user .getWorld ().equals (getWorld ())) {
39
+ if (!Util . getWorld ( user .getWorld () ).equals (getWorld ())) {
39
40
user .sendMessage ("general.errors.wrong-world" );
40
41
return false ;
41
42
}
Original file line number Diff line number Diff line change 5
5
6
6
import world .bentobox .bentobox .api .commands .CompositeCommand ;
7
7
import world .bentobox .bentobox .api .user .User ;
8
+ import world .bentobox .bentobox .util .Util ;
8
9
import world .bentobox .greenhouses .Greenhouses ;
9
10
10
11
/**
@@ -45,7 +46,7 @@ public void setup() {
45
46
*/
46
47
@ Override
47
48
public boolean execute (User user , String label , List <String > args ) {
48
- if (!user .getWorld ().equals (getWorld ())) {
49
+ if (!Util . getWorld ( user .getWorld () ).equals (getWorld ())) {
49
50
user .sendMessage ("general.errors.wrong-world" );
50
51
return false ;
51
52
}
You can’t perform that action at this time.
0 commit comments