Upstream/bentobox
1
0
Fork 0
mirror of https://github.com/BentoBoxWorld/BentoBox.git synced 2024-11-23 19:25:12 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/BentoBoxWorld/BentoBox.git into develop

Browse Source
This commit is contained in:
tastybento 2020-10-08 16:04:11 -07:00
commit 6f1aceee40
2 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
.travis.yml
View File

@ -6,12 +6,18 @@ addons:
jdk: jdk:
- openjdk8 - openjdk8
- openjdk11
matrix:
allow_failures:
- jdk: openjdk11
script: script:
#- sonar-scanner - mvn clean org.jacoco:jacoco-maven-plugin:prepare-agent install
- mvn clean org.jacoco:jacoco-maven-plugin:prepare-agent install sonar:sonar -Dsonar.projectKey=BentoBoxWorld_BentoBox - export JAVA_HOME=$HOME/openjdk11
#- mvn clean org.jacoco:jacoco-maven-plugin:prepare-agent package -P sonar sonar:sonar -B - $TRAVIS_BUILD_DIR/install-jdk.sh --install openjdk11 --target $JAVA_HOME
#- echo "${TRAVIS_PULL_REQUEST_BRANCH:-$TRAVIS_BRANCH}" - mvn sonar:sonar -Dsonar.projectKey=BentoBoxWorld_BentoBox
cache: cache:
directories: directories:
- '$HOME/.m2/repository' - '$HOME/.m2/repository'

12
src/main/java/world/bentobox/bentobox/listeners/flags/protection/BlockInteractionListener.java
View File

@ -1,5 +1,7 @@
package world.bentobox.bentobox.listeners.flags.protection; package world.bentobox.bentobox.listeners.flags.protection;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map; import java.util.Map;
import java.util.Optional; import java.util.Optional;
@ -16,8 +18,6 @@ import org.bukkit.event.block.BlockBreakEvent;
import org.bukkit.event.block.BlockFromToEvent; import org.bukkit.event.block.BlockFromToEvent;
import org.bukkit.event.player.PlayerInteractEvent; import org.bukkit.event.player.PlayerInteractEvent;
import com.google.common.collect.ImmutableMap;
import world.bentobox.bentobox.BentoBox; import world.bentobox.bentobox.BentoBox;
import world.bentobox.bentobox.api.flags.Flag; import world.bentobox.bentobox.api.flags.Flag;
import world.bentobox.bentobox.api.flags.FlagListener; import world.bentobox.bentobox.api.flags.FlagListener;
@ -34,8 +34,12 @@ public class BlockInteractionListener extends FlagListener {
* These cover materials in another server version. * These cover materials in another server version.
* This avoids run time errors due to unknown enum values, at the expense of a string comparison * This avoids run time errors due to unknown enum values, at the expense of a string comparison
*/ */
private final Map<String, String> stringFlags = ImmutableMap.<String, String>builder() private final static Map<String, String> stringFlags;
.build(); static {
Map<String, String> f = new HashMap<>();
f.put("RESPAWN_ANCHOR", "PLACE_BLOCKS");
stringFlags = Collections.unmodifiableMap(f);
}
/** /**
* Handle interaction with blocks * Handle interaction with blocks