Fixed disabling fly & losing items in void

This commit is contained in:
Lilac 2019-09-15 19:04:15 +01:00
parent f16b63792e
commit 9e7618d5e6
4 changed files with 7 additions and 3 deletions

View File

@ -3,7 +3,7 @@ image: gradle:alpine
variables:
name: "FabledSkyBlock"
path: "/builds/$CI_PROJECT_PATH"
version: "Build-79.1"
version: "Build-79.2"
before_script:
- export GRADLE_USER_HOME=`pwd`/.gradle

View File

@ -1223,7 +1223,9 @@ public class IslandManager {
}
public void updateFlight(Player player) {
if (player.getGameMode() == GameMode.CREATIVE)
// The player can fly in other worlds if they are in creative or have another plugin's fly permission.
if (player.getGameMode() == GameMode.CREATIVE || player.getGameMode() == GameMode.SPECTATOR
|| player.hasPermission("essentials.fly") || player.hasPermission("cmi.command.fly"))
return;
Island island = getIslandAtLocation(player.getLocation());

View File

@ -142,7 +142,7 @@ public class Move implements Listener {
if (configLoad.getBoolean("Island.Void.Teleport.Enable")) {
if (to.getY() <= configLoad.getInt("Island.Void.Teleport.Offset")) {
if (!keepItemsOnDeath) {
if (configLoad.getBoolean("Island.Void.Teleport.ClearInventory")) {
player.getInventory().clear();
player.setLevel(0);
player.setExp(0.0F);

View File

@ -210,6 +210,8 @@ Island:
Island: true
# The Y position that the player is teleported when reached.
Offset: 30
# When enabled, the players inventory and XP will be cleared when they fall off of the Island.
ClearInventory: false
Block:
Obsidian:
# When enabled, players can right-click an obsidian block to retrieve lava at an Island.