From 099892f8a320b7b6d33fb16a785333f1b348883e Mon Sep 17 00:00:00 2001 From: filoghost Date: Fri, 18 Nov 2016 11:11:46 +0100 Subject: [PATCH] Remove unneeded override --- .../nms/v1_10_R1/EntityNMSItem.java | 11 ----------- .../nms/v1_8_R1/EntityNMSItem.java | 11 ----------- .../nms/v1_8_R2/EntityNMSItem.java | 11 ----------- .../nms/v1_8_R3/EntityNMSItem.java | 11 ----------- .../nms/v1_9_R1/EntityNMSItem.java | 11 ----------- .../nms/v1_9_R2/EntityNMSItem.java | 11 ----------- 6 files changed, 66 deletions(-) diff --git a/HolographicDisplays/Plugin/com/gmail/filoghost/holographicdisplays/nms/v1_10_R1/EntityNMSItem.java b/HolographicDisplays/Plugin/com/gmail/filoghost/holographicdisplays/nms/v1_10_R1/EntityNMSItem.java index 1c13e84c..876d4be7 100644 --- a/HolographicDisplays/Plugin/com/gmail/filoghost/holographicdisplays/nms/v1_10_R1/EntityNMSItem.java +++ b/HolographicDisplays/Plugin/com/gmail/filoghost/holographicdisplays/nms/v1_10_R1/EntityNMSItem.java @@ -70,17 +70,6 @@ public class EntityNMSItem extends EntityItem implements NMSItem { } } - @Override - public ItemStack getItemStack() { - // Dirty method to check if the icon is being picked up - StackTraceElement[] stacktrace = Thread.currentThread().getStackTrace(); - if (stacktrace.length > 2 && stacktrace[2].getClassName().contains("EntityInsentient")) { - return null; // Try to pickup this, dear entity ignoring the pickupDelay! - } - - return super.getItemStack(); - } - // Method called when a player is near. @Override public void d(EntityHuman human) { diff --git a/HolographicDisplays/Plugin/com/gmail/filoghost/holographicdisplays/nms/v1_8_R1/EntityNMSItem.java b/HolographicDisplays/Plugin/com/gmail/filoghost/holographicdisplays/nms/v1_8_R1/EntityNMSItem.java index 0850fb31..4092ef9c 100644 --- a/HolographicDisplays/Plugin/com/gmail/filoghost/holographicdisplays/nms/v1_8_R1/EntityNMSItem.java +++ b/HolographicDisplays/Plugin/com/gmail/filoghost/holographicdisplays/nms/v1_8_R1/EntityNMSItem.java @@ -46,17 +46,6 @@ public class EntityNMSItem extends EntityItem implements NMSItem { } } - @Override - public ItemStack getItemStack() { - // Dirty method to check if the icon is being picked up - StackTraceElement[] stacktrace = Thread.currentThread().getStackTrace(); - if (stacktrace.length > 2 && stacktrace[2].getClassName().contains("EntityInsentient")) { - return null; // Try to pickup this, dear entity ignoring the pickupDelay! - } - - return super.getItemStack(); - } - // Method called when a player is near. @Override public void d(EntityHuman human) { diff --git a/HolographicDisplays/Plugin/com/gmail/filoghost/holographicdisplays/nms/v1_8_R2/EntityNMSItem.java b/HolographicDisplays/Plugin/com/gmail/filoghost/holographicdisplays/nms/v1_8_R2/EntityNMSItem.java index c395943d..9f19e55c 100644 --- a/HolographicDisplays/Plugin/com/gmail/filoghost/holographicdisplays/nms/v1_8_R2/EntityNMSItem.java +++ b/HolographicDisplays/Plugin/com/gmail/filoghost/holographicdisplays/nms/v1_8_R2/EntityNMSItem.java @@ -46,17 +46,6 @@ public class EntityNMSItem extends EntityItem implements NMSItem { } } - @Override - public ItemStack getItemStack() { - // Dirty method to check if the icon is being picked up - StackTraceElement[] stacktrace = Thread.currentThread().getStackTrace(); - if (stacktrace.length > 2 && stacktrace[2].getClassName().contains("EntityInsentient")) { - return null; // Try to pickup this, dear entity ignoring the pickupDelay! - } - - return super.getItemStack(); - } - // Method called when a player is near. @Override public void d(EntityHuman human) { diff --git a/HolographicDisplays/Plugin/com/gmail/filoghost/holographicdisplays/nms/v1_8_R3/EntityNMSItem.java b/HolographicDisplays/Plugin/com/gmail/filoghost/holographicdisplays/nms/v1_8_R3/EntityNMSItem.java index ae30931e..7f7d3c6f 100644 --- a/HolographicDisplays/Plugin/com/gmail/filoghost/holographicdisplays/nms/v1_8_R3/EntityNMSItem.java +++ b/HolographicDisplays/Plugin/com/gmail/filoghost/holographicdisplays/nms/v1_8_R3/EntityNMSItem.java @@ -46,17 +46,6 @@ public class EntityNMSItem extends EntityItem implements NMSItem { } } - @Override - public ItemStack getItemStack() { - // Dirty method to check if the icon is being picked up - StackTraceElement[] stacktrace = Thread.currentThread().getStackTrace(); - if (stacktrace.length > 2 && stacktrace[2].getClassName().contains("EntityInsentient")) { - return null; // Try to pickup this, dear entity ignoring the pickupDelay! - } - - return super.getItemStack(); - } - // Method called when a player is near. @Override public void d(EntityHuman human) { diff --git a/HolographicDisplays/Plugin/com/gmail/filoghost/holographicdisplays/nms/v1_9_R1/EntityNMSItem.java b/HolographicDisplays/Plugin/com/gmail/filoghost/holographicdisplays/nms/v1_9_R1/EntityNMSItem.java index 8bdb8cb6..84b89d2f 100644 --- a/HolographicDisplays/Plugin/com/gmail/filoghost/holographicdisplays/nms/v1_9_R1/EntityNMSItem.java +++ b/HolographicDisplays/Plugin/com/gmail/filoghost/holographicdisplays/nms/v1_9_R1/EntityNMSItem.java @@ -70,17 +70,6 @@ public class EntityNMSItem extends EntityItem implements NMSItem { } } - @Override - public ItemStack getItemStack() { - // Dirty method to check if the icon is being picked up - StackTraceElement[] stacktrace = Thread.currentThread().getStackTrace(); - if (stacktrace.length > 2 && stacktrace[2].getClassName().contains("EntityInsentient")) { - return null; // Try to pickup this, dear entity ignoring the pickupDelay! - } - - return super.getItemStack(); - } - // Method called when a player is near. @Override public void d(EntityHuman human) { diff --git a/HolographicDisplays/Plugin/com/gmail/filoghost/holographicdisplays/nms/v1_9_R2/EntityNMSItem.java b/HolographicDisplays/Plugin/com/gmail/filoghost/holographicdisplays/nms/v1_9_R2/EntityNMSItem.java index 6c32ffc1..990b702d 100644 --- a/HolographicDisplays/Plugin/com/gmail/filoghost/holographicdisplays/nms/v1_9_R2/EntityNMSItem.java +++ b/HolographicDisplays/Plugin/com/gmail/filoghost/holographicdisplays/nms/v1_9_R2/EntityNMSItem.java @@ -70,17 +70,6 @@ public class EntityNMSItem extends EntityItem implements NMSItem { } } - @Override - public ItemStack getItemStack() { - // Dirty method to check if the icon is being picked up - StackTraceElement[] stacktrace = Thread.currentThread().getStackTrace(); - if (stacktrace.length > 2 && stacktrace[2].getClassName().contains("EntityInsentient")) { - return null; // Try to pickup this, dear entity ignoring the pickupDelay! - } - - return super.getItemStack(); - } - // Method called when a player is near. @Override public void d(EntityHuman human) {