Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/3.0.8.8' into 3.0.8.9
Browse files Browse the repository at this point in the history
  • Loading branch information
tastybento committed May 12, 2018
2 parents 3a2e80d + 6169f87 commit c5d0869
Showing 1 changed file with 0 additions and 5 deletions.
5 changes: 0 additions & 5 deletions src/com/wasteofplastic/askyblock/commands/IslandCmd.java
Original file line number Diff line number Diff line change
Expand Up @@ -1850,7 +1850,6 @@ public void run() {
}
} else if (split[0].equalsIgnoreCase("coopaccept")) {
// Accept an invite command
if (VaultHelper.checkPerm(player, Settings.PERMPREFIX + "coop")) {
if (coopInviteList.containsKey(playerUUID)) {
// Check if inviter is online
Player inviter = plugin.getServer().getPlayer(coopInviteList.get(playerUUID));
Expand All @@ -1872,10 +1871,6 @@ public void run() {
}
Util.sendMessage(player, ChatColor.RED + plugin.myLocale(player.getUniqueId()).errorCommandNotReady);
return true;
} else {
Util.sendMessage(player, ChatColor.RED + plugin.myLocale(playerUUID).errorNoPermission);
return true;
}
} else if (split[0].equalsIgnoreCase("accept")) {
// Accept an invite command
if (VaultHelper.checkPerm(player, Settings.PERMPREFIX + "team.join")) {
Expand Down

0 comments on commit c5d0869

Please sign in to comment.