EpicKnarvik97/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2025-06-28 03:34:42 +02:00
Code Issues Projects Releases Wiki Activity

Manually fix some merge conflicts

Browse Source
This commit is contained in:
Alexander Söderberg
2020-07-14 19:34:44 +02:00
parent 198bcfdf4d
commit b68d7150f1
19 changed files with 115 additions and 226 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Bukkit/src/main/java/com/plotsquared/bukkit/player/BukkitPlayer.java
View File

@ -161,7 +161,7 @@ public class BukkitPlayer extends PlotPlayer<Player> {
}
}
@Override public boolean hasPermission(@NotNull final String permission) {
@Override public boolean hasPermission(@Nonnull final String permission) {
if (this.offline && this.econHandler != null) {
return this.econHandler.hasPermission(getName(), permission);
}
@ -228,7 +228,7 @@ public class BukkitPlayer extends PlotPlayer<Player> {
return max;
}
@Override public boolean isPermissionSet(@NotNull final String permission) {
@Override public boolean isPermissionSet(@Nonnull final String permission) {
return this.player.isPermissionSet(permission);
}
@ -351,7 +351,7 @@ public class BukkitPlayer extends PlotPlayer<Player> {
return this.player.isBanned();
}
@Override @NotNull public Audience getAudience() {
@Override @Nonnull public Audience getAudience() {
return BukkitUtil.BUKKIT_AUDIENCES.player(this.player);
}