Upstream
/
Limits
mirror of https://github.com/BentoBoxWorld/Limits.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Updated to BentoBox 1.15.4 API

This commit is contained in:
tastybento 2020-12-27 11:11:54 -08:00
parent 514f2158cc
commit 8ce7c3e631
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pom.xml
View File

@ -57,14 +57,14 @@
<!-- Non-minecraft related dependencies --> <!-- Non-minecraft related dependencies -->
<powermock.version>2.0.2</powermock.version> <powermock.version>2.0.2</powermock.version>
<!-- More visible way how to change dependency versions --> <!-- More visible way how to change dependency versions -->
<spigot.version>1.16.1-R0.1-SNAPSHOT</spigot.version> <spigot.version>1.16.3-R0.1-SNAPSHOT</spigot.version>
<bentobox.version>1.14.0</bentobox.version> <bentobox.version>1.15.4-SNAPSHOT</bentobox.version>
<!-- Revision variable removes warning about dynamic version --> <!-- Revision variable removes warning about dynamic version -->
<revision>${build.version}-SNAPSHOT</revision> <revision>${build.version}-SNAPSHOT</revision>
<!-- 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.15.1</build.version> <build.version>1.15.2</build.version>
</properties> </properties>
<!-- Profiles will allow to automatically change build version. --> <!-- Profiles will allow to automatically change build version. -->

8
src/main/java/world/bentobox/limits/listeners/BlockLimitsListener.java
View File

@ -40,7 +40,7 @@ import org.bukkit.event.entity.EntityExplodeEvent;
import org.bukkit.event.player.PlayerInteractEvent; import org.bukkit.event.player.PlayerInteractEvent;
import org.eclipse.jdt.annotation.Nullable; import org.eclipse.jdt.annotation.Nullable;
import world.bentobox.bentobox.api.events.island.IslandEvent.IslandDeleteEvent; import world.bentobox.bentobox.api.events.island.IslandDeleteEvent;
import world.bentobox.bentobox.api.localization.TextVariables; import world.bentobox.bentobox.api.localization.TextVariables;
import world.bentobox.bentobox.api.user.User; import world.bentobox.bentobox.api.user.User;
import world.bentobox.bentobox.database.Database; import world.bentobox.bentobox.database.Database;
@ -280,7 +280,7 @@ public class BlockLimitsListener implements Listener {
// Return equivalents. b can be Block/Material // Return equivalents. b can be Block/Material
public Material fixMaterial(BlockData b) { public Material fixMaterial(BlockData b) {
Material mat = b.getMaterial(); Material mat = b.getMaterial();
if (mat == Material.REDSTONE_WALL_TORCH) { if (mat == Material.REDSTONE_WALL_TORCH) {
return Material.REDSTONE_TORCH; return Material.REDSTONE_TORCH;
} else if (mat == Material.WALL_TORCH) { } else if (mat == Material.WALL_TORCH) {
@ -304,8 +304,8 @@ public class BlockLimitsListener implements Listener {
} }
} }
return mat; return mat;
} }
/** /**
* Check if a block can be * Check if a block can be
* *

2
src/main/java/world/bentobox/limits/listeners/JoinListener.java
View File

@ -20,7 +20,7 @@ import org.bukkit.permissions.PermissionAttachmentInfo;
import world.bentobox.bentobox.api.events.island.IslandEvent; import world.bentobox.bentobox.api.events.island.IslandEvent;
import world.bentobox.bentobox.api.events.island.IslandEvent.Reason; import world.bentobox.bentobox.api.events.island.IslandEvent.Reason;
import world.bentobox.bentobox.api.events.team.TeamEvent.TeamSetownerEvent; import world.bentobox.bentobox.api.events.team.TeamSetownerEvent;
import world.bentobox.bentobox.database.objects.Island; import world.bentobox.bentobox.database.objects.Island;
import world.bentobox.limits.Limits; import world.bentobox.limits.Limits;
import world.bentobox.limits.Settings.EntityGroup; import world.bentobox.limits.Settings.EntityGroup;

2
src/main/resources/addon.yml
View File

@ -1,7 +1,7 @@
name: Limits name: Limits
main: world.bentobox.limits.Limits main: world.bentobox.limits.Limits
version: ${version}${build.number} version: ${version}${build.number}
api-version: 1.14 api-version: 1.15.4
authors: tastybento authors: tastybento

2
src/test/java/bentobox/addon/limits/listeners/JoinListenerTest.java
View File

@ -37,7 +37,7 @@ import org.powermock.modules.junit4.PowerMockRunner;
import world.bentobox.bentobox.api.addons.AddonDescription; import world.bentobox.bentobox.api.addons.AddonDescription;
import world.bentobox.bentobox.api.addons.GameModeAddon; import world.bentobox.bentobox.api.addons.GameModeAddon;
import world.bentobox.bentobox.api.events.island.IslandEvent; import world.bentobox.bentobox.api.events.island.IslandEvent;
import world.bentobox.bentobox.api.events.team.TeamEvent.TeamSetownerEvent; import world.bentobox.bentobox.api.events.team.TeamSetownerEvent;
import world.bentobox.bentobox.database.objects.Island; import world.bentobox.bentobox.database.objects.Island;
import world.bentobox.bentobox.managers.IslandsManager; import world.bentobox.bentobox.managers.IslandsManager;
import world.bentobox.limits.Limits; import world.bentobox.limits.Limits;