Upstream/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-11-21 11:45:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes https://github.com/IntellectualSites/PlotSquaredSuggestions/issues/23

Browse Source
This commit is contained in:
NotMyFault 2021-04-02 23:48:16 +02:00
parent b02177e1d0
commit dd9edb68b2
No known key found for this signature in database
GPG Key ID: 158F5701A6AAD00C
3 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Bukkit/src/main/resources/plugin.yml
View File

@ -286,6 +286,8 @@ permissions:
default: false default: false
plots.admin.command.clear: plots.admin.command.clear:
default: false default: false
plots.admin.flight:
default: false
plots.teleport.delay.bypass: plots.teleport.delay.bypass:
default: false default: false
@ -425,4 +427,4 @@ permissions:
plots.save: true plots.save: true
plots.done: true plots.done: true
plots.continue: true plots.continue: true
plots.middle: true plots.middle: true

16
Core/src/main/java/com/plotsquared/core/listener/PlotListener.java
View File

@ -186,15 +186,17 @@ public class PlotListener {
} }
final FlyFlag.FlyStatus flyStatus = plot.getFlag(FlyFlag.class); final FlyFlag.FlyStatus flyStatus = plot.getFlag(FlyFlag.class);
if (flyStatus != FlyFlag.FlyStatus.DEFAULT) { if (!Permissions.hasPermission(player, Permission.PERMISSION_ADMIN_FLIGHT)) {
boolean flight = player.getFlight(); if (flyStatus != FlyFlag.FlyStatus.DEFAULT) {
GameMode gamemode = player.getGameMode(); boolean flight = player.getFlight();
if (flight != (gamemode == GameModes.CREATIVE || gamemode == GameModes.SPECTATOR)) { GameMode gamemode = player.getGameMode();
try (final MetaDataAccess<Boolean> metaDataAccess = player.accessPersistentMetaData(PlayerMetaDataKeys.PERSISTENT_FLIGHT)) { if (flight != (gamemode == GameModes.CREATIVE || gamemode == GameModes.SPECTATOR)) {
metaDataAccess.set(player.getFlight()); try (final MetaDataAccess<Boolean> metaDataAccess = player.accessPersistentMetaData(PlayerMetaDataKeys.PERSISTENT_FLIGHT)) {
metaDataAccess.set(player.getFlight());
}
} }
player.setFlight(flyStatus == FlyFlag.FlyStatus.ENABLED);
} }
player.setFlight(flyStatus == FlyFlag.FlyStatus.ENABLED);
} }
final GameMode gameMode = plot.getFlag(GamemodeFlag.class); final GameMode gameMode = plot.getFlag(GamemodeFlag.class);

3
Core/src/main/java/com/plotsquared/core/permissions/Permission.java
View File

@ -201,7 +201,8 @@ public enum Permission {
PERMISSION_ADMIN_BACKUP_OTHER("plots.admin.backup.other"), PERMISSION_ADMIN_BACKUP_OTHER("plots.admin.backup.other"),
PERMISSION_ADMIN_ALLOW_UNSAFE("plots.admin.unsafe"), PERMISSION_ADMIN_ALLOW_UNSAFE("plots.admin.unsafe"),
PERMISSION_ADMIN_DEBUG_OTHER("plots.admin.debug.other"), PERMISSION_ADMIN_DEBUG_OTHER("plots.admin.debug.other"),
PERMISSION_RATE("plots.rate"); PERMISSION_RATE("plots.rate"),
PERMISSION_ADMIN_FLIGHT("plots.admin.flight");
//</editor-fold> //</editor-fold>
private final String text; private final String text;