kaboomserver
/
weapons
mirror of https://github.com/kaboomserver/weapons.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Don't use weapons is event is cancelled

This commit is contained in:
mathiascode 2021-01-07 13:57:42 +02:00
parent 305dcd12fd
commit 5980216b78
2 changed files with 36 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/pw/kaboom/weapons/modules/player/PlayerReceiveWeapon.java
View File

@ -9,14 +9,16 @@ import org.bukkit.inventory.ItemStack;
public final class PlayerReceiveWeapon implements Listener {
@EventHandler
void onInventoryClick(final InventoryClickEvent event) {
if ("Weapons".equals(event.getView().getTitle())) {
final ItemStack item = event.getCurrentItem();
final Player player = (Player) event.getWhoClicked();
player.getInventory().addItem(item);
player.closeInventory();
player.sendMessage("You have received the " + item.getItemMeta().getDisplayName().toLowerCase() + "!");
if (event.isCancelled() || !"Weapons".equals(event.getView().getTitle())) {
return;
}
final ItemStack item = event.getCurrentItem();
final Player player = (Player) event.getWhoClicked();
player.getInventory().addItem(item);
player.closeInventory();
player.sendMessage("You have received the " + item.getItemMeta().getDisplayName().toLowerCase() + "!");
}
}

52
src/main/java/pw/kaboom/weapons/modules/player/PlayerUseWeapon.java
View File

@ -20,34 +20,36 @@ import pw.kaboom.weapons.modules.weapons.WeaponSniper;
public final class PlayerUseWeapon implements Listener {
@EventHandler
void onPlayerInteract(final PlayerInteractEvent event) {
if (event.hasItem()) {
String name = "";
if (event.isCancelled() || !event.hasItem()) {
return;
}
try {
name = event.getItem().getItemMeta().getDisplayName();
} catch (Exception ignored) {
return;
}
String name = "";
final Action action = event.getAction();
final Material item = event.getMaterial();
try {
name = event.getItem().getItemMeta().getDisplayName();
} catch (Exception ignored) {
return;
}
if (action == Action.LEFT_CLICK_AIR
|| action == Action.LEFT_CLICK_BLOCK) {
WeaponAnvilDropper.leftClick(item, name, event);
WeaponArcher.leftClick(item, name, event);
WeaponArmageddon.leftClick(item, name, event);
WeaponBlobinator.leftClick(item, name, event);
WeaponLightningStick.leftClick(item, name, event);
WeaponNuker.leftClick(item, name, event);
WeaponSniper.leftClick(item, name, event);
} else if (action == Action.RIGHT_CLICK_AIR
|| action == Action.RIGHT_CLICK_BLOCK) {
WeaponGrenade.rightClick(item, name, event);
WeaponLaser.rightClick(item, name, event);
WeaponMachineGun.rightClick(item, name, event);
WeaponSniper.rightClick(item, name, event);
}
final Action action = event.getAction();
final Material item = event.getMaterial();
if (action == Action.LEFT_CLICK_AIR
|| action == Action.LEFT_CLICK_BLOCK) {
WeaponAnvilDropper.leftClick(item, name, event);
WeaponArcher.leftClick(item, name, event);
WeaponArmageddon.leftClick(item, name, event);
WeaponBlobinator.leftClick(item, name, event);
WeaponLightningStick.leftClick(item, name, event);
WeaponNuker.leftClick(item, name, event);
WeaponSniper.leftClick(item, name, event);
} else if (action == Action.RIGHT_CLICK_AIR
|| action == Action.RIGHT_CLICK_BLOCK) {
WeaponGrenade.rightClick(item, name, event);
WeaponLaser.rightClick(item, name, event);
WeaponMachineGun.rightClick(item, name, event);
WeaponSniper.rightClick(item, name, event);
}
}
}