Skip to content

Commit

Permalink
Merge pull request #199 from BentoBoxWorld/develop
Browse files Browse the repository at this point in the history
Version 1.23.0
  • Loading branch information
tastybento authored Sep 20, 2024
2 parents 005c3fd + f08c458 commit 0cb42d3
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 4 deletions.
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
<!-- Do not change unless you want different name for local builds. -->
<build.number>-LOCAL</build.number>
<!-- This allows to change between versions. -->
<build.version>1.22.0</build.version>
<build.version>1.23.0</build.version>
<sonar.projectKey>BentoBoxWorld_Limits</sonar.projectKey>
<sonar.organization>bentobox-world</sonar.organization>
<sonar.host.url>https://sonarcloud.io</sonar.host.url>
Expand Down
9 changes: 6 additions & 3 deletions src/main/java/world/bentobox/limits/Limits.java
Original file line number Diff line number Diff line change
Expand Up @@ -210,10 +210,13 @@ private String getLimit(@Nullable User user, Material m, GameModeAddon gm) {
if (is == null) {
return LIMIT_NOT_SET;
}

if (user != null) {
// Check the permissions of the user and update
this.getJoinListener().checkPerms(user.getPlayer(), gm.getPermissionPrefix() + "island.limit.",
is.getUniqueId(), gm.getDescription().getName());
}
int limit = this.getBlockLimitListener().
getMaterialLimits(is.getWorld(), is.getUniqueId()).
getOrDefault(m, -1);
getMaterialLimits(is.getWorld(), is.getUniqueId()).getOrDefault(m, -1);

return limit == -1 ? LIMIT_NOT_SET : String.valueOf(limit);
}
Expand Down

0 comments on commit 0cb42d3

Please sign in to comment.