Merge pull request #3 from BentoBoxWorld/develop

Develop
This commit is contained in:
tastybento 2018-09-02 10:25:46 +08:00 committed by GitHub
commit 98663e4a0e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 23 additions and 4 deletions

8
README.md Normal file
View File

@ -0,0 +1,8 @@
# addon-acidisland
AcidIsland add-on for BentoBox
## Installing
1. Place this jar into the addon folder of the BentoBox plugin.
2. Reload/restart the server
3. Adjust the config.yml how you like

View File

@ -6,7 +6,7 @@
<groupId>us.tastybento</groupId>
<artifactId>AcidIsland</artifactId>
<version>0.1.0-SNAPSHOT</version>
<version>0.2.0-SNAPSHOT</version>
<name>AcidIsland</name>
<description>AcidIsland is an add-on for BentoBox, an expandable Minecraft Bukkit plugin for island-type games like ASkyBlock or AcidIsland.</description>

View File

@ -18,6 +18,10 @@ import world.bentobox.bentobox.api.commands.island.IslandSetnameCommand;
import world.bentobox.bentobox.api.commands.island.IslandSettingsCommand;
import world.bentobox.bentobox.api.commands.island.IslandUnbanCommand;
import world.bentobox.bentobox.api.commands.island.team.IslandTeamCommand;
import world.bentobox.bentobox.api.commands.island.team.IslandTeamCoopCommand;
import world.bentobox.bentobox.api.commands.island.team.IslandTeamTrustCommand;
import world.bentobox.bentobox.api.commands.island.team.IslandTeamUncoopCommand;
import world.bentobox.bentobox.api.commands.island.team.IslandTeamUntrustCommand;
import world.bentobox.bentobox.api.user.User;
public class AiCommand extends CompositeCommand {
@ -53,6 +57,10 @@ public class AiCommand extends CompositeCommand {
new IslandBanlistCommand(this);
// Team commands
new IslandTeamCommand(this);
new IslandTeamTrustCommand(this);
new IslandTeamUntrustCommand(this);
new IslandTeamCoopCommand(this);
new IslandTeamUncoopCommand(this);
}
/* (non-Javadoc)

View File

@ -132,7 +132,6 @@ public class AcidEffect implements Listener {
}
// If they are already burning in acid then return
if (burningPlayers.contains(player)) {
// plugin.getLogger().info("DEBUG: no acid water is false");
return;
}
if (isSafeFromAcid(player)) {
@ -233,8 +232,6 @@ public class AcidEffect implements Listener {
// Check if player has an active water potion or not
Collection<PotionEffect> activePotions = player.getActivePotionEffects();
for (PotionEffect s : activePotions) {
// plugin.getLogger().info("Potion is : " +
// s.getType().toString());
if (s.getType().equals(PotionEffectType.WATER_BREATHING)) {
// Safe!
return true;

View File

@ -50,6 +50,12 @@ permissions:
acidisland.island.team:
description: Let a player use team commands
default: true
acidisland.island.team.trust:
description: Let a player use team trust commands
default: true
acidisland.island.team.coop:
description: Let a player use team coop commands
default: true
acidisland.settings.*:
description: Allow access to settings panel items
default: true