Upstream/addon-level
1
0
Fork 0
mirror of https://github.com/BentoBoxWorld/Level.git synced 2024-06-25 22:15:03 +02:00
Code Issues Projects Releases Wiki Activity

Compare commits

base: Upstream:5b4bdf8293186a8eb79b8648225116e440009ebf
Branches Tags
Upstream:develop
Upstream:master
Upstream:2.13.0
Upstream:2.12.0
Upstream:2.11.0
Upstream:2.10.0
Upstream:2.9.0
Upstream:2.8.1
Upstream:2.8.0
Upstream:2.6.5
Upstream:2.7.2
Upstream:2.6.4
Upstream:2.7.0
Upstream:2.6.3
Upstream:2.6.2
Upstream:2.6.1
Upstream:2.6.0
Upstream:2.5.2
Upstream:2.5.0
Upstream:2.4.1
Upstream:2.4.1-alpha
Upstream:2.4.0
Upstream:2.3.3
Upstream:v2.3.0-rc
Upstream:v2.3.0-beta2
Upstream:v2.2.0-beta
Upstream:v2.3.0-beta
Upstream:V1.9.3
Upstream:1.9.0
Upstream:1.8.0
Upstream:1.6.0
Upstream:1.5.0
Upstream:1.4.0
Upstream:1.3.0
Upstream:0.2.0
Upstream:0.1.0
Upstream:0.0.1
Upstream:0.1
..
compare: Upstream:5f1adc27b70ac1ee2aeb3f3289dcb06447c5fcfc
Branches Tags
Upstream:develop
Upstream:master
Upstream:2.13.0
Upstream:2.12.0
Upstream:2.11.0
Upstream:2.10.0
Upstream:2.9.0
Upstream:2.8.1
Upstream:2.8.0
Upstream:2.6.5
Upstream:2.7.2
Upstream:2.6.4
Upstream:2.7.0
Upstream:2.6.3
Upstream:2.6.2
Upstream:2.6.1
Upstream:2.6.0
Upstream:2.5.2
Upstream:2.5.0
Upstream:2.4.1
Upstream:2.4.1-alpha
Upstream:2.4.0
Upstream:2.3.3
Upstream:v2.3.0-rc
Upstream:v2.3.0-beta2
Upstream:v2.2.0-beta
Upstream:v2.3.0-beta
Upstream:V1.9.3
Upstream:1.9.0
Upstream:1.8.0
Upstream:1.6.0
Upstream:1.5.0
Upstream:1.4.0
Upstream:1.3.0
Upstream:0.2.0
Upstream:0.1.0
Upstream:0.0.1
Upstream:0.1

No commits in common. "5b4bdf8293186a8eb79b8648225116e440009ebf" and "5f1adc27b70ac1ee2aeb3f3289dcb06447c5fcfc" have entirely different histories.
5b4bdf8293 ... 5f1adc27b7

2 changed files with 8 additions and 2 deletions
Show Stats Expand all files Collapse all files

6
pom.xml
View File

@ -245,6 +245,12 @@
<version>1.0.0-20240329.173606-35</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.craftaro</groupId>
<artifactId>CraftaroCore</artifactId>
<version>3.0.5-20240406.040431-1</version>
<scope>provided</scope>
</dependency>
</dependencies>
<build>

4
src/main/java/world/bentobox/level/calculators/IslandLevelCalculator.java
View File

@ -41,7 +41,7 @@ import com.google.common.collect.Multiset;
import com.google.common.collect.Multiset.Entry;
import com.google.common.collect.Multisets;
import com.craftaro.ultimatestacker.api.UltimateStackerApi;
import com.craftaro.ultimatestacker.api.utils.Stackable;
import com.craftaro.ultimatestacker.api.stack.block.BlockStack;
import dev.rosewood.rosestacker.api.RoseStackerAPI;
import us.lynuxcraft.deadsilenceiv.advancedchests.AdvancedChestsAPI;
@ -468,7 +468,7 @@ public class IslandLevelCalculator {
if (addon.isUltimateStackerEnabled()) {
if (!blockData.getMaterial().equals(Material.AIR)) {
Stackable stack = UltimateStackerApi.getBlockStackManager().getBlock(block.getLocation());
BlockStack stack = UltimateStackerApi.getBlockStackManager().getBlock(block.getLocation());
if (stack != null) {
int value = limitCount(blockData.getMaterial());
if (belowSeaLevel) {