Patched "Sword + Golden Apple" and canceled the crystal placement wit…

…h offhand while eating
ciruu1 · Apr 11, 2021 · b164d6d · b164d6d
1 parent 126aeeb
commit b164d6d
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 6 deletions.
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>me.ciruu</groupId>
     <artifactId>offhandpatch</artifactId>
-    <version>1.0</version>
+    <version>1.1</version>
     <packaging>jar</packaging>
 
     <name>OffhandPatch</name>

diff --git a/src/main/java/me/ciruu/offhandpatch/Offhandpatch.java b/src/main/java/me/ciruu/offhandpatch/Offhandpatch.java
@@ -4,7 +4,9 @@
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
+import org.bukkit.event.block.Action;
 import org.bukkit.event.entity.EntityDamageByEntityEvent;
+import org.bukkit.event.player.PlayerInteractEvent;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.plugin.java.JavaPlugin;
 
@@ -26,12 +28,32 @@ public void onEntityAttack(EntityDamageByEntityEvent event) {
             Player player = (Player) event.getDamager();
             ItemStack mainHand = player.getInventory().getItemInMainHand();
             ItemStack offHand = player.getInventory().getItemInOffHand();
-            if (player.getActiveItem().getType() == Material.GOLDEN_APPLE &&
-                    ((offHand.getType() == Material.END_CRYSTAL && mainHand.getType() == Material.GOLDEN_APPLE) ||
-                    (mainHand.getType() == Material.END_CRYSTAL && offHand.getType() == Material.GOLDEN_APPLE))
-            ) {
+            if (cancelAttack(mainHand.getType(), offHand.getType(), player))
                 event.setCancelled(true);
-            }
         }
     }
+
+    @EventHandler
+    public void onPlayerInteract(PlayerInteractEvent event) {
+        if (event.getAction() == Action.RIGHT_CLICK_BLOCK) {
+            Player player = event.getPlayer();
+            ItemStack mainHand = player.getInventory().getItemInMainHand();
+            ItemStack offHand = player.getInventory().getItemInOffHand();
+
+            // Make sure that the player is interacting with an end crystal
+            if (event.getMaterial() == Material.END_CRYSTAL && cancelPlace(mainHand.getType(), offHand.getType(), player))
+                event.setCancelled(true);
+        }
+    }
+
+    private boolean cancelAttack(Material mainHand, Material offHand, Player player) {
+        return ((mainHand == Material.GOLDEN_APPLE && offHand == Material.END_CRYSTAL) ||
+                ((mainHand == Material.END_CRYSTAL || mainHand == Material.DIAMOND_SWORD) && offHand == Material.GOLDEN_APPLE)
+                        && player.getActiveItem().getType() == Material.GOLDEN_APPLE);
+    }
+
+    private boolean cancelPlace(Material mainHand, Material offHand, Player player) {
+        return (mainHand == Material.GOLDEN_APPLE && offHand == Material.END_CRYSTAL) ||
+                (mainHand == Material.END_CRYSTAL && offHand == Material.GOLDEN_APPLE && player.getActiveItem().getType() == Material.GOLDEN_APPLE);
+    }
 }