mirror of
https://github.com/PikaMug/Quests.git
synced 2024-09-27 14:42:36 +02:00
Remove deprecated permission check method
This commit is contained in:
parent
b4d11ff9c3
commit
f2c6e070d3
@ -3508,30 +3508,19 @@ public class Quests extends JavaPlugin implements ConversationAbandonedListener
|
||||
* @return {@code true} if entity is a Player that has permission
|
||||
*/
|
||||
public boolean canUseQuests(UUID uuid) {
|
||||
return !checkQuester(uuid);
|
||||
}
|
||||
|
||||
/**
|
||||
* Checks if player CANNOT use Quests
|
||||
*
|
||||
* @param uuid the entity UUID to be checked
|
||||
* @return {@code true} if entity has no permission or is not a player
|
||||
* @deprecated Use {@link #canUseQuests(UUID)}
|
||||
*/
|
||||
public boolean checkQuester(UUID uuid) {
|
||||
if (!(Bukkit.getPlayer(uuid) instanceof Player)) {
|
||||
return true;
|
||||
return false;
|
||||
}
|
||||
Player p = Bukkit.getPlayer(uuid);
|
||||
if (p.isOp()) {
|
||||
return false;
|
||||
return true;
|
||||
}
|
||||
try {
|
||||
for (PermissionAttachmentInfo pm : p.getEffectivePermissions()) {
|
||||
if (pm.getPermission().startsWith("quests")
|
||||
|| pm.getPermission().equals("*")
|
||||
|| pm.getPermission().equals("*.*")) {
|
||||
return false;
|
||||
return true;
|
||||
}
|
||||
}
|
||||
} catch (NullPointerException ne) {
|
||||
@ -3539,7 +3528,7 @@ public class Quests extends JavaPlugin implements ConversationAbandonedListener
|
||||
} catch (ConcurrentModificationException cme) {
|
||||
// Bummer. Not much we can do about it
|
||||
}
|
||||
return true;
|
||||
return false;
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -41,7 +41,7 @@ public class BlockListener implements Listener {
|
||||
@SuppressWarnings("deprecation")
|
||||
@EventHandler(priority = EventPriority.HIGHEST)
|
||||
public void onBlockBreak(BlockBreakEvent evt) {
|
||||
if (plugin.checkQuester(evt.getPlayer().getUniqueId()) == false) {
|
||||
if (plugin.canUseQuests(evt.getPlayer().getUniqueId())) {
|
||||
final ItemStack blockItemStack = new ItemStack(evt.getBlock().getType(), 1, evt.getBlock().getState()
|
||||
.getData().toItemStack().getDurability());
|
||||
Quester quester = plugin.getQuester(evt.getPlayer().getUniqueId());
|
||||
@ -99,7 +99,7 @@ public class BlockListener implements Listener {
|
||||
@SuppressWarnings("deprecation") // since 1.13
|
||||
@EventHandler
|
||||
public void onBlockDamage(BlockDamageEvent evt) {
|
||||
if (plugin.checkQuester(evt.getPlayer().getUniqueId()) == false) {
|
||||
if (plugin.canUseQuests(evt.getPlayer().getUniqueId())) {
|
||||
final ItemStack blockItemStack = new ItemStack(evt.getBlock().getType(), 1, evt.getBlock().getState()
|
||||
.getData().toItemStack().getDurability());
|
||||
Quester quester = plugin.getQuester(evt.getPlayer().getUniqueId());
|
||||
@ -120,7 +120,7 @@ public class BlockListener implements Listener {
|
||||
@SuppressWarnings("deprecation") // since 1.13
|
||||
@EventHandler(priority = EventPriority.HIGHEST)
|
||||
public void onBlockPlace(BlockPlaceEvent evt) {
|
||||
if (plugin.checkQuester(evt.getPlayer().getUniqueId()) == false) {
|
||||
if (plugin.canUseQuests(evt.getPlayer().getUniqueId())) {
|
||||
final ItemStack blockItemStack = new ItemStack(evt.getBlock().getType(), 1, evt.getBlock().getState()
|
||||
.getData().toItemStack().getDurability());
|
||||
Quester quester = plugin.getQuester(evt.getPlayer().getUniqueId());
|
||||
@ -150,7 +150,7 @@ public class BlockListener implements Listener {
|
||||
// Do nothing, getHand() not present pre-1.9
|
||||
}
|
||||
if (e == null || e.equals(EquipmentSlot.HAND)) { //If the event is fired by HAND (main hand)
|
||||
if (plugin.checkQuester(evt.getPlayer().getUniqueId()) == false) {
|
||||
if (plugin.canUseQuests(evt.getPlayer().getUniqueId())) {
|
||||
final Quester quester = plugin.getQuester(evt.getPlayer().getUniqueId());
|
||||
if (evt.getAction().equals(Action.RIGHT_CLICK_BLOCK)) {
|
||||
if (evt.isCancelled() == false) {
|
||||
|
@ -38,11 +38,10 @@ public class ItemListener implements Listener {
|
||||
this.plugin = plugin;
|
||||
}
|
||||
|
||||
@SuppressWarnings("deprecation")
|
||||
@EventHandler
|
||||
public void onCraftItem(CraftItemEvent evt) {
|
||||
if (evt.getWhoClicked() instanceof Player) {
|
||||
if (plugin.checkQuester(evt.getWhoClicked().getUniqueId()) == false) {
|
||||
if (plugin.canUseQuests(evt.getWhoClicked().getUniqueId())) {
|
||||
final ItemStack craftedItem = getCraftedItem(evt);
|
||||
Quester quester = plugin.getQuester(evt.getWhoClicked().getUniqueId());
|
||||
for (Quest quest : plugin.getQuests()) {
|
||||
|
@ -183,7 +183,7 @@ public class PlayerListener implements Listener {
|
||||
return;
|
||||
}
|
||||
}
|
||||
if (plugin.checkQuester(evt.getPlayer().getUniqueId()) == false) {
|
||||
if (plugin.canUseQuests(evt.getPlayer().getUniqueId())) {
|
||||
final Quester quester = plugin.getQuester(evt.getPlayer().getUniqueId());
|
||||
final Player player = evt.getPlayer();
|
||||
if (evt.getAction().equals(Action.RIGHT_CLICK_BLOCK)) {
|
||||
|
Loading…
Reference in New Issue
Block a user