Fixed issue #8 where PlayerInteractEvent was returning null

MtthwBrwng · Jul 13, 2016 · efce19a · efce19a
1 parent c87bd60
commit efce19a
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>net.mattslab.flashlightplus</groupId>
     <artifactId>FlashlightPlus</artifactId>
-    <version>1.10.2-1.0.16</version>
+    <version>1.10.2-1.0.17</version>
 
     <repositories>
         <repository>

diff --git a/src/main/java/net/mattslab/FlashlightPlus/listeners/Commander.java b/src/main/java/net/mattslab/FlashlightPlus/listeners/Commander.java
@@ -51,7 +51,7 @@ public boolean onCommand(CommandSender sender, Command cmd, String label, String
                 } else if (args[0].equalsIgnoreCase("spawn") && player.hasPermission("flashlight.spawn")) {
                     ItemStack flashlight = new ItemBuilder(Material.TORCH)
                             .withName(ChatColor.DARK_AQUA + "[" + ChatColor.WHITE + "Flashlight" + ChatColor.DARK_AQUA + "]")
-                            .withLores(ChatColor.RED + "Usage:", ChatColor.GREEN + "Left click for a night vision effect")
+                            .withLores(ChatColor.RED + "Usage:", ChatColor.GREEN + "Right click for a night vision effect")
                             .withAmount(1)
                             .toItemStack();
                     if (args.length == 1) {

diff --git a/src/main/java/net/mattslab/FlashlightPlus/listeners/EventListener.java b/src/main/java/net/mattslab/FlashlightPlus/listeners/EventListener.java
@@ -37,23 +37,23 @@ public void onLeave(PlayerQuitEvent e) {
     public void onPlayerInteract(PlayerInteractEvent event) {
         Player player = event.getPlayer();
         PlayerInventory playerInv = event.getPlayer().getInventory();
-        ItemStack torchMain = playerInv.getItemInMainHand();
-        if ((event.getAction() == Action.LEFT_CLICK_AIR)) {
-            if (torchMain.getItemMeta().getDisplayName().equals(ChatColor.DARK_AQUA + "[" + ChatColor.WHITE + "Flashlight" + ChatColor.DARK_AQUA + "]")) {
-                togglePlayer(player);
-            }
+        ItemStack torch = playerInv.getItemInMainHand();
+        if ((event.getAction() == Action.RIGHT_CLICK_AIR) &&
+                (torch.hasItemMeta()) &&
+                (torch.getItemMeta().getDisplayName() != null) &&
+                (torch.getItemMeta().getDisplayName().equals(ChatColor.DARK_AQUA + "[" + ChatColor.WHITE + "Flashlight" + ChatColor.DARK_AQUA + "]"))) {
+            togglePlayer(player);
         }
     }
 
-
     @EventHandler
     public void onPlayerPlace(PlayerInteractEvent event) {
         PlayerInventory playerInv = event.getPlayer().getInventory();
-        ItemStack torchMain = playerInv.getItemInMainHand();
+        ItemStack torch = playerInv.getItemInMainHand();
         if ((event.getAction() == Action.RIGHT_CLICK_BLOCK) &&
-                (torchMain.hasItemMeta()) &&
-                (torchMain.getItemMeta().getDisplayName() != null) &&
-                (torchMain.getItemMeta().getDisplayName().equals(ChatColor.DARK_AQUA + "[" + ChatColor.WHITE + "Flashlight" + ChatColor.DARK_AQUA + "]"))) {
+                (torch.hasItemMeta()) &&
+                (torch.getItemMeta().getDisplayName() != null) &&
+                (torch.getItemMeta().getDisplayName().equals(ChatColor.DARK_AQUA + "[" + ChatColor.WHITE + "Flashlight" + ChatColor.DARK_AQUA + "]"))) {
             event.setCancelled(true);
         }