Upstream/bentobox
1
0
Fork 0
mirror of https://github.com/BentoBoxWorld/BentoBox.git synced 2025-02-15 11:51:55 +01:00
Code Issues Projects Releases Wiki Activity

Add checking for enchantment table inventory (#2191)

Browse Source 
Fixes #2190
This commit is contained in:
tastybento 2023-09-19 21:07:28 -07:00 committed by GitHub
parent a4bef159be
commit 2bc82dd3cf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 50 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/world/bentobox/bentobox/listeners/flags/protection/InventoryListener.java
View File

@ -22,6 +22,7 @@ import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority; import org.bukkit.event.EventPriority;
import org.bukkit.event.inventory.InventoryClickEvent; import org.bukkit.event.inventory.InventoryClickEvent;
import org.bukkit.event.inventory.InventoryOpenEvent; import org.bukkit.event.inventory.InventoryOpenEvent;
import org.bukkit.inventory.EnchantingInventory;
import org.bukkit.inventory.InventoryHolder; import org.bukkit.inventory.InventoryHolder;
import world.bentobox.bentobox.api.flags.FlagListener; import world.bentobox.bentobox.api.flags.FlagListener;
@ -69,6 +70,14 @@ public class InventoryListener extends FlagListener
public void onInventoryClick(InventoryClickEvent e) public void onInventoryClick(InventoryClickEvent e)
{ {
Player player = (Player) e.getWhoClicked(); Player player = (Player) e.getWhoClicked();
// Enchanting
if (e.getInventory() instanceof EnchantingInventory) {
this.checkIsland(e, player, e.getInventory().getLocation(), Flags.ENCHANTING);
return;
}
// Inventory holders
InventoryHolder inventoryHolder = e.getInventory().getHolder(); InventoryHolder inventoryHolder = e.getInventory().getHolder();
if (inventoryHolder == null || !(e.getWhoClicked() instanceof Player)) if (inventoryHolder == null || !(e.getWhoClicked() instanceof Player))
@ -130,7 +139,6 @@ public class InventoryListener extends FlagListener
} }
else if (inventoryHolder instanceof ChestBoat) else if (inventoryHolder instanceof ChestBoat)
{ {
// TODO: 1.19 added chest boat. Remove compatibility check when 1.18 is dropped.
this.checkIsland(e, player, e.getInventory().getLocation(), Flags.CHEST); this.checkIsland(e, player, e.getInventory().getLocation(), Flags.CHEST);
} }
else if (!(inventoryHolder instanceof Player)) else if (!(inventoryHolder instanceof Player))

41
src/test/java/world/bentobox/bentobox/listeners/flags/protection/InventoryListenerTest.java
View File

@ -32,6 +32,7 @@ import org.bukkit.event.inventory.ClickType;
import org.bukkit.event.inventory.InventoryAction; import org.bukkit.event.inventory.InventoryAction;
import org.bukkit.event.inventory.InventoryClickEvent; import org.bukkit.event.inventory.InventoryClickEvent;
import org.bukkit.event.inventory.InventoryType.SlotType; import org.bukkit.event.inventory.InventoryType.SlotType;
import org.bukkit.inventory.EnchantingInventory;
import org.bukkit.inventory.Inventory; import org.bukkit.inventory.Inventory;
import org.bukkit.inventory.InventoryHolder; import org.bukkit.inventory.InventoryHolder;
import org.bukkit.inventory.InventoryView; import org.bukkit.inventory.InventoryView;
@ -82,6 +83,25 @@ public class InventoryListenerTest extends AbstractCommonSetup {
l = new InventoryListener(); l = new InventoryListener();
} }
/**
* Test method for {@link world.bentobox.bentobox.listeners.flags.protection.InventoryListener#onInventoryClick(org.bukkit.event.inventory.InventoryClickEvent)}.
*/
@Test
public void testOnInventoryClickEnchantingAllowed() {
InventoryView view = mock(InventoryView.class);
when(view.getPlayer()).thenReturn(player);
EnchantingInventory inv = mock(EnchantingInventory.class);
when(inv.getSize()).thenReturn(9);
when(view.getTopInventory()).thenReturn(inv);
when(inv.getLocation()).thenReturn(location);
when(view.getBottomInventory()).thenReturn(inv);
SlotType slotType = SlotType.CRAFTING;
InventoryAction action = InventoryAction.PLACE_ONE;
InventoryClickEvent e = new InventoryClickEvent(view, slotType, 0, ClickType.LEFT, action );
l.onInventoryClick(e);
assertFalse(e.isCancelled());
}
/** /**
* Test method for {@link world.bentobox.bentobox.listeners.flags.protection.InventoryListener#onInventoryClick(org.bukkit.event.inventory.InventoryClickEvent)}. * Test method for {@link world.bentobox.bentobox.listeners.flags.protection.InventoryListener#onInventoryClick(org.bukkit.event.inventory.InventoryClickEvent)}.
*/ */
@ -195,6 +215,27 @@ public class InventoryListenerTest extends AbstractCommonSetup {
verify(notifier, times(HOLDERS.size())).notify(any(), eq("protection.protected")); verify(notifier, times(HOLDERS.size())).notify(any(), eq("protection.protected"));
} }
/**
* Test method for {@link world.bentobox.bentobox.listeners.flags.protection.InventoryListener#onInventoryClick(org.bukkit.event.inventory.InventoryClickEvent)}.
*/
@Test
public void testOnInventoryClickEnchantingNotAllowed() {
when(island.isAllowed(any(), any())).thenReturn(false);
InventoryView view = mock(InventoryView.class);
when(view.getPlayer()).thenReturn(player);
EnchantingInventory inv = mock(EnchantingInventory.class);
when(inv.getSize()).thenReturn(9);
when(view.getTopInventory()).thenReturn(inv);
when(inv.getLocation()).thenReturn(location);
when(view.getBottomInventory()).thenReturn(inv);
SlotType slotType = SlotType.CRAFTING;
InventoryAction action = InventoryAction.PLACE_ONE;
InventoryClickEvent e = new InventoryClickEvent(view, slotType, 0, ClickType.LEFT, action );
l.onInventoryClick(e);
assertTrue(e.isCancelled());
verify(notifier).notify(any(), eq("protection.protected"));
}
/** /**
* Test method for {@link world.bentobox.bentobox.listeners.flags.protection.InventoryListener#onInventoryClick(org.bukkit.event.inventory.InventoryClickEvent)}. * Test method for {@link world.bentobox.bentobox.listeners.flags.protection.InventoryListener#onInventoryClick(org.bukkit.event.inventory.InventoryClickEvent)}.
*/ */