Skip to content

Fix interference with plugins that cancel events #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
CoPokBl wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix interference with plugins that cancel events #10

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 23 additions & 0 deletions src/main/java/me/matistan05/minecraftsharedinventory/listeners/EventListeners.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import me.matistan05.minecraftsharedinventory.classes.SharedInventoryGame;
import org.bukkit.Bukkit;
import org.bukkit.entity.Player;
import org.bukkit.event.Event;
import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener;
import org.bukkit.event.block.Action;
Expand Down Expand Up @@ -54,6 +55,7 @@ public EventListeners(Main main) {
// If item is dropped from open inventory, it is then cancelled by InventoryClickEvent
@EventHandler
public void onDropItem(PlayerDropItemEvent e) {
if (e.isCancelled()) return;
// Bukkit.broadcastMessage("PlayerDropItemEvent");
SharedInventoryGame game = getGameFromPlayer(e.getPlayer().getName());
if (game == null) return;
Expand All @@ -67,6 +69,7 @@ public void onDropItem(PlayerDropItemEvent e) {

@EventHandler
public void onPickupItem(EntityPickupItemEvent e) {
if (e.isCancelled()) return;
// Bukkit.broadcastMessage("EntityPickupItemEvent");
if (!(e.getEntity() instanceof Player)) return;
Player player = (Player) e.getEntity();
Expand All @@ -82,6 +85,7 @@ public void onPickupItem(EntityPickupItemEvent e) {

@EventHandler
public void onBucketEmpty(PlayerBucketEmptyEvent e) {
if (e.isCancelled()) return;
// Bukkit.broadcastMessage("PlayerBucketEmptyEvent");
SharedInventoryGame game = getGameFromPlayer(e.getPlayer().getName());
if (game == null) return;
Expand All @@ -95,6 +99,7 @@ public void onBucketEmpty(PlayerBucketEmptyEvent e) {

@EventHandler
public void onBucketFill(PlayerBucketFillEvent e) {
if (e.isCancelled()) return;
// Bukkit.broadcastMessage("PlayerBucketFillEvent");
SharedInventoryGame game = getGameFromPlayer(e.getPlayer().getName());
if (game == null) return;
Expand All @@ -108,6 +113,7 @@ public void onBucketFill(PlayerBucketFillEvent e) {

@EventHandler
public void onBlockPlace(BlockPlaceEvent e) {
if (e.isCancelled()) return;
// Bukkit.broadcastMessage("BlockPlaceEvent");
SharedInventoryGame game = getGameFromPlayer(e.getPlayer().getName());
if (game == null) return;
Expand All @@ -121,6 +127,7 @@ public void onBlockPlace(BlockPlaceEvent e) {

@EventHandler
public void onInventoryClick(InventoryClickEvent e) {
if (e.isCancelled()) return;
// Bukkit.broadcastMessage("InventoryClickEvent");
if (!(e.getWhoClicked() instanceof Player)) return;
Player player = (Player) e.getWhoClicked();
Expand All @@ -136,6 +143,7 @@ public void onInventoryClick(InventoryClickEvent e) {

@EventHandler
public void onInventoryDrag(InventoryDragEvent e) {
if (e.isCancelled()) return;
// Bukkit.broadcastMessage("InventoryDragEvent");
if (!(e.getWhoClicked() instanceof Player)) return;
Player player = (Player) e.getWhoClicked();
Expand Down Expand Up @@ -178,6 +186,7 @@ public void onRespawn(PlayerRespawnEvent e) {

@EventHandler
public void onSwapItem(PlayerSwapHandItemsEvent e) {
if (e.isCancelled()) return;
// Bukkit.broadcastMessage("PlayerSwapHandItemsEvent");
SharedInventoryGame game = getGameFromPlayer(e.getPlayer().getName());
if (game == null) return;
Expand All @@ -191,6 +200,7 @@ public void onSwapItem(PlayerSwapHandItemsEvent e) {

@EventHandler
public void onItemDamage(PlayerItemDamageEvent e) {
if (e.isCancelled()) return;
// Bukkit.broadcastMessage("PlayerItemDamageEvent");
SharedInventoryGame game = getGameFromPlayer(e.getPlayer().getName());
if (game == null) return;
Expand All @@ -204,6 +214,7 @@ public void onItemDamage(PlayerItemDamageEvent e) {

@EventHandler
public void onItemConsume(PlayerItemConsumeEvent e) {
if (e.isCancelled()) return;
// Bukkit.broadcastMessage("PlayerItemConsumeEvent");
SharedInventoryGame game = getGameFromPlayer(e.getPlayer().getName());
if (game == null) return;
Expand All @@ -217,6 +228,7 @@ public void onItemConsume(PlayerItemConsumeEvent e) {

@EventHandler
public void onProjectileLaunch(ProjectileLaunchEvent e) {
if (e.isCancelled()) return;
// Bukkit.broadcastMessage("ProjectileLaunchEvent");
if (!(e.getEntity().getShooter() instanceof Player)) return;
Player player = (Player) e.getEntity().getShooter();
Expand All @@ -232,6 +244,7 @@ public void onProjectileLaunch(ProjectileLaunchEvent e) {

@EventHandler
public void onArrowPickup(PlayerPickupArrowEvent e) {
if (e.isCancelled()) return;
// Bukkit.broadcastMessage("PlayerPickupArrowEvent");
SharedInventoryGame game = getGameFromPlayer(e.getPlayer().getName());
if (game == null) return;
Expand All @@ -245,6 +258,7 @@ public void onArrowPickup(PlayerPickupArrowEvent e) {

@EventHandler
public void onDispenseArmor(BlockDispenseArmorEvent e) {
if (e.isCancelled()) return;
// Bukkit.broadcastMessage("BlockDispenseArmorEvent");//
if (!(e.getTargetEntity() instanceof Player)) return;
Player player = (Player) e.getTargetEntity();
Expand All @@ -260,6 +274,7 @@ public void onDispenseArmor(BlockDispenseArmorEvent e) {

@EventHandler
public void onArmorStandManipulate(PlayerArmorStandManipulateEvent e) {
if (e.isCancelled()) return;
// Bukkit.broadcastMessage("PlayerArmorStandManipulateEvent");//
SharedInventoryGame game = getGameFromPlayer(e.getPlayer().getName());
if (game == null) return;
Expand All @@ -273,6 +288,7 @@ public void onArmorStandManipulate(PlayerArmorStandManipulateEvent e) {

@EventHandler
public void onLeadUse(PlayerLeashEntityEvent e) {
if (e.isCancelled()) return;
// Bukkit.broadcastMessage("PlayerLeashEntityEvent");//
SharedInventoryGame game = getGameFromPlayer(e.getPlayer().getName());
if (game == null) return;
Expand All @@ -286,6 +302,7 @@ public void onLeadUse(PlayerLeashEntityEvent e) {

@EventHandler
public void onEntityShear(PlayerShearEntityEvent e) {
if (e.isCancelled()) return;
// Bukkit.broadcastMessage("PlayerShearEntityEvent");//
SharedInventoryGame game = getGameFromPlayer(e.getPlayer().getName());
if (game == null) return;
Expand All @@ -299,6 +316,7 @@ public void onEntityShear(PlayerShearEntityEvent e) {

@EventHandler
public void onVehicleCreate(VehicleCreateEvent e) {
if (e.isCancelled()) return;
// Bukkit.broadcastMessage("VehicleCreateEvent");
for (SharedInventoryGame game : games.values()) {
if (!game.inProgress()) continue;
Expand All @@ -310,6 +328,7 @@ public void onVehicleCreate(VehicleCreateEvent e) {

@EventHandler
public void onCauldronLevelChange(CauldronLevelChangeEvent e) {
if (e.isCancelled()) return;
Bukkit.broadcastMessage("CauldronLevelChangeEvent");
for (SharedInventoryGame game : games.values()) {
if (!game.inProgress()) continue;
Expand All @@ -321,6 +340,7 @@ public void onCauldronLevelChange(CauldronLevelChangeEvent e) {

@EventHandler
public void onLodeStoneClick(PlayerInteractEvent e) { // todo: good
if (e.useInteractedBlock() == Event.Result.DENY) return;
if (!e.getAction().equals(Action.RIGHT_CLICK_BLOCK)) return;
if (e.getClickedBlock() == null) return;
if (!e.getClickedBlock().getType().name().contains("LODESTONE")) return;
Expand All @@ -330,6 +350,7 @@ public void onLodeStoneClick(PlayerInteractEvent e) { // todo: good

@EventHandler
public void onItemFramePlace(HangingPlaceEvent e) {
if (e.isCancelled()) return;
// Bukkit.broadcastMessage("HangingPlaceEvent");
for (SharedInventoryGame game : games.values()) {
if (!game.inProgress()) continue;
Expand All @@ -341,6 +362,7 @@ public void onItemFramePlace(HangingPlaceEvent e) {

@EventHandler
public void onPlayerCommand(PlayerCommandPreprocessEvent e) {
if (e.isCancelled()) return;
// Bukkit.broadcastMessage("PlayerCommandPreprocessEvent");
String command = e.getMessage().split(" ")[0].substring(1);
if (commandEqual(command, "give") ||
Expand All @@ -360,6 +382,7 @@ public void onPlayerCommand(PlayerCommandPreprocessEvent e) {

@EventHandler
public void onConsoleCommand(ServerCommandEvent e) {
if (e.isCancelled()) return;
// Bukkit.broadcastMessage("ServerCommandEvent");
String command = e.getCommand().split(" ")[0];
if (commandEqual(command, "give") ||
Expand Down