From 478c761750e229272e54d1662ee370440d72c800 Mon Sep 17 00:00:00 2001
From: MattBDev <4009945+MattBDev@users.noreply.github.com>
Date: Sun, 15 Dec 2019 12:53:16 -0500
Subject: [PATCH] More PlayerEvent fixes.

---
 .../bukkit/listeners/PlayerEvents.java        | 26 +++----------------
 1 file changed, 3 insertions(+), 23 deletions(-)

diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents.java
index 1f6dbd594..4af11f4d6 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents.java
@@ -1924,23 +1924,15 @@ import java.util.regex.Pattern;
             //todo rearrange the right click code. it is all over the place.
             case RIGHT_CLICK_BLOCK: {
                 Material blockType = block.getType();
+                eventType = PlayerBlockEventType.INTERACT_BLOCK;
                 if (blockType.isInteractable() && player.isSneaking()) {
                     return; //this returns so the block place event is called
                 }
-                if (blockType.isInteractable()) {
-                    eventType = PlayerBlockEventType.INTERACT_BLOCK;
-                }
                 blocktype1 = BukkitAdapter.asBlockType(block.getType());
-                if (eventType != null && !player.isSneaking()) {
+                if (!player.isSneaking()) {
                     break;
                 }
                 Material type = event.getMaterial();
-                if (type == Material.AIR) {
-                    if (!player.isSneaking() && blockType.isInteractable()) {
-                        eventType = PlayerBlockEventType.INTERACT_BLOCK;
-                        break outer;
-                    }
-                }
 
                 // in the following, lb needs to have the material of the item in hand i.e. type
                 if (type == Material.REDSTONE || type == Material.STRING
@@ -2001,7 +1993,7 @@ import java.util.regex.Pattern;
             }
             case LEFT_CLICK_BLOCK: {
                 location = BukkitUtil.getLocation(block.getLocation());
-                //                eventType = PlayerBlockEventType.BREAK_BLOCK;
+                //eventType = PlayerBlockEventType.BREAK_BLOCK;
                 blocktype1 = BukkitAdapter.asBlockType(block.getType());
                 if (block.getType() == Material.DRAGON_EGG) {
                     eventType = PlayerBlockEventType.TELEPORT_OBJECT;
@@ -2018,18 +2010,6 @@ import java.util.regex.Pattern;
                 return;
             }
         }
-        if (eventType == null) {
-            PlotSquared.log("Please report this to PlotSquared Developers: ");
-            PlotSquared.log("Action: " + event.getAction().toString());
-            PlotSquared.log("HasItem: " + event.hasItem());
-            PlotSquared.log("HasBlock: " + event.hasBlock());
-            PlotSquared.log("getItem: " + (event.hasItem() ? Objects.requireNonNull(event.getItem())
-                .toString() : "null"));
-            PlotSquared.log("getBlockFace: " + (event.getBlockFace() != null ? event.getBlockFace().toString() : "null"));
-            PlotSquared.log("isBlockInHand: " + (event.isBlockInHand()));
-            PlotSquared.log("getClickedBlock: " + (event.getClickedBlock() != null ? event.getClickedBlock().toString() : "null"));
-            return;
-        }
         if (!EventUtil.manager.checkPlayerBlockEvent(pp, eventType, location, blocktype1, true)) {
             event.setCancelled(true);
             event.setUseInteractedBlock(Event.Result.DENY);