Upstream/HolographicDisplays
1
0
Fork 0
mirror of https://github.com/filoghost/HolographicDisplays.git synced 2024-07-25 21:24:55 +02:00
Code Issues Projects Releases Wiki Activity

Fixes #58

Browse Source
This commit is contained in:
filoghost 2017-05-19 20:01:21 +02:00
parent f3c03a9c24
commit 1a41b4bd0d
16 changed files with 41 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
HolographicDisplays/Plugin/com/gmail/filoghost/holographicdisplays/nms/v1_10_R1/EntityNMSArmorStand.java
View File

@ -128,7 +128,7 @@ public class EntityNMSArmorStand extends EntityArmorStand implements NMSArmorSta
@Override
public int getId() {
StackTraceElement element = ReflectionUtils.getStackTraceElement(2);
if (element.getFileName().equals("EntityTrackerEntry.java") && 158 < element.getLineNumber() && element.getLineNumber() < 168) {
if (element != null && element.getFileName() != null && element.getFileName().equals("EntityTrackerEntry.java") && 158 < element.getLineNumber() && element.getLineNumber() < 168) {
// Then this method is being called when creating a new movement packet, we return a fake ID!
return -1;
}

2
HolographicDisplays/Plugin/com/gmail/filoghost/holographicdisplays/nms/v1_11_R1/EntityNMSArmorStand.java
View File

@ -137,7 +137,7 @@ public class EntityNMSArmorStand extends EntityArmorStand implements NMSArmorSta
@Override
public int getId() {
StackTraceElement element = ReflectionUtils.getStackTraceElement(2);
if (element.getFileName().equals("EntityTrackerEntry.java") && 158 < element.getLineNumber() && element.getLineNumber() < 168) {
if (element != null && element.getFileName() != null && element.getFileName().equals("EntityTrackerEntry.java") && 158 < element.getLineNumber() && element.getLineNumber() < 168) {
// Then this method is being called when creating a new movement packet, we return a fake ID!
return -1;
}

2
HolographicDisplays/Plugin/com/gmail/filoghost/holographicdisplays/nms/v1_7_R1/EntityNMSItem.java
View File

@ -53,7 +53,7 @@ public class EntityNMSItem extends EntityItem implements NMSItem {
public ItemStack getItemStack() {
// Dirty method to check if the icon is being picked up
StackTraceElement element = ReflectionUtils.getStackTraceElement(2);
if (element.getClassName().contains("EntityInsentient")) {
if (element != null && element.getFileName() != null && element.getClassName().contains("EntityInsentient")) {
return null; // Try to pickup this, dear entity ignoring the pickupDelay!
}

2
HolographicDisplays/Plugin/com/gmail/filoghost/holographicdisplays/nms/v1_7_R1/EntityNMSWitherSkull.java
View File

@ -72,7 +72,7 @@ public class EntityNMSWitherSkull extends EntityWitherSkull implements NMSWither
@Override
public int getId() {
StackTraceElement element = ReflectionUtils.getStackTraceElement(2);
if (element.getFileName().equals("EntityTrackerEntry.java") && element.getLineNumber() > 134 && element.getLineNumber() < 144) {
if (element != null && element.getFileName() != null && element.getFileName().equals("EntityTrackerEntry.java") && element.getLineNumber() > 134 && element.getLineNumber() < 144) {
// Then this method is being called when creating a new packet, we return a fake ID!
return -1;
}

2
HolographicDisplays/Plugin/com/gmail/filoghost/holographicdisplays/nms/v1_7_R2/EntityNMSItem.java
View File

@ -53,7 +53,7 @@ public class EntityNMSItem extends EntityItem implements NMSItem {
public ItemStack getItemStack() {
// Dirty method to check if the icon is being picked up
StackTraceElement element = ReflectionUtils.getStackTraceElement(2);
if (element.getClassName().contains("EntityInsentient")) {
if (element != null && element.getFileName() != null && element.getClassName().contains("EntityInsentient")) {
return null; // Try to pickup this, dear entity ignoring the pickupDelay!
}

2
HolographicDisplays/Plugin/com/gmail/filoghost/holographicdisplays/nms/v1_7_R2/EntityNMSWitherSkull.java
View File

@ -74,7 +74,7 @@ public class EntityNMSWitherSkull extends EntityWitherSkull implements NMSWither
@Override
public int getId() {
StackTraceElement element = ReflectionUtils.getStackTraceElement(2);
if (element.getFileName().equals("EntityTrackerEntry.java") && element.getLineNumber() > 134 && element.getLineNumber() < 144) {
if (element != null && element.getFileName() != null && element.getFileName().equals("EntityTrackerEntry.java") && element.getLineNumber() > 134 && element.getLineNumber() < 144) {
// Then this method is being called when creating a new packet, we return a fake ID!
return -1;
}

2
HolographicDisplays/Plugin/com/gmail/filoghost/holographicdisplays/nms/v1_7_R3/EntityNMSItem.java
View File

@ -53,7 +53,7 @@ public class EntityNMSItem extends EntityItem implements NMSItem {
public ItemStack getItemStack() {
// Dirty method to check if the icon is being picked up
StackTraceElement element = ReflectionUtils.getStackTraceElement(2);
if (element.getClassName().contains("EntityInsentient")) {
if (element != null && element.getFileName() != null && element.getClassName().contains("EntityInsentient")) {
return null; // Try to pickup this, dear entity ignoring the pickupDelay!
}

2
HolographicDisplays/Plugin/com/gmail/filoghost/holographicdisplays/nms/v1_7_R3/EntityNMSWitherSkull.java
View File

@ -72,7 +72,7 @@ public class EntityNMSWitherSkull extends EntityWitherSkull implements NMSWither
@Override
public int getId() {
StackTraceElement element = ReflectionUtils.getStackTraceElement(2);
if (element.getFileName().equals("EntityTrackerEntry.java") && element.getLineNumber() > 134 && element.getLineNumber() < 144) {
if (element != null && element.getFileName() != null && element.getFileName().equals("EntityTrackerEntry.java") && element.getLineNumber() > 134 && element.getLineNumber() < 144) {
// Then this method is being called when creating a new packet, we return a fake ID!
return -1;
}

2
HolographicDisplays/Plugin/com/gmail/filoghost/holographicdisplays/nms/v1_7_R4/EntityNMSItem.java
View File

@ -49,7 +49,7 @@ public class EntityNMSItem extends EntityItem implements NMSItem {
public ItemStack getItemStack() {
// Dirty method to check if the icon is being picked up
StackTraceElement element = ReflectionUtils.getStackTraceElement(2);
if (element.getClassName().contains("EntityInsentient")) {
if (element != null && element.getFileName() != null && element.getClassName().contains("EntityInsentient")) {
return null; // Try to pickup this, dear entity ignoring the pickupDelay!
}

2
HolographicDisplays/Plugin/com/gmail/filoghost/holographicdisplays/nms/v1_7_R4/EntityNMSWitherSkull.java
View File

@ -71,7 +71,7 @@ public class EntityNMSWitherSkull extends EntityWitherSkull implements NMSWither
@Override
public int getId() {
StackTraceElement element = ReflectionUtils.getStackTraceElement(2);
if (element.getFileName().equals("EntityTrackerEntry.java") && element.getLineNumber() > 134 && element.getLineNumber() < 144) {
if (element != null && element.getFileName() != null && element.getFileName().equals("EntityTrackerEntry.java") && element.getLineNumber() > 134 && element.getLineNumber() < 144) {
// Then this method is being called when creating a new packet, we return a fake ID!
return -1;
}

2
HolographicDisplays/Plugin/com/gmail/filoghost/holographicdisplays/nms/v1_8_R1/EntityNMSArmorStand.java
View File

@ -113,7 +113,7 @@ public class EntityNMSArmorStand extends EntityArmorStand implements NMSArmorSta
@Override
public int getId() {
StackTraceElement element = ReflectionUtils.getStackTraceElement(2);
if (element.getFileName().equals("EntityTrackerEntry.java") && element.getLineNumber() > 137 && element.getLineNumber() < 147) {
if (element != null && element.getFileName() != null && element.getFileName().equals("EntityTrackerEntry.java") && element.getLineNumber() > 137 && element.getLineNumber() < 147) {
// Then this method is being called when creating a new packet, we return a fake ID!
return -1;
}

2
HolographicDisplays/Plugin/com/gmail/filoghost/holographicdisplays/nms/v1_8_R2/EntityNMSArmorStand.java
View File

@ -113,7 +113,7 @@ public class EntityNMSArmorStand extends EntityArmorStand implements NMSArmorSta
@Override
public int getId() {
StackTraceElement element = ReflectionUtils.getStackTraceElement(2);
if (element.getFileName().equals("EntityTrackerEntry.java") && element.getLineNumber() > 137 && element.getLineNumber() < 147) {
if (element != null && element.getFileName() != null && element.getFileName().equals("EntityTrackerEntry.java") && element.getLineNumber() > 137 && element.getLineNumber() < 147) {
// Then this method is being called when creating a new packet, we return a fake ID!
return -1;
}

2
HolographicDisplays/Plugin/com/gmail/filoghost/holographicdisplays/nms/v1_8_R3/EntityNMSArmorStand.java
View File

@ -113,7 +113,7 @@ public class EntityNMSArmorStand extends EntityArmorStand implements NMSArmorSta
@Override
public int getId() {
StackTraceElement element = ReflectionUtils.getStackTraceElement(2);
if (element.getFileName().equals("EntityTrackerEntry.java") && element.getLineNumber() > 137 && element.getLineNumber() < 147) {
if (element != null && element.getFileName() != null && element.getFileName().equals("EntityTrackerEntry.java") && element.getLineNumber() > 137 && element.getLineNumber() < 147) {
// Then this method is being called when creating a new packet, we return a fake ID!
return -1;
}

2
HolographicDisplays/Plugin/com/gmail/filoghost/holographicdisplays/nms/v1_9_R1/EntityNMSArmorStand.java
View File

@ -132,7 +132,7 @@ public class EntityNMSArmorStand extends EntityArmorStand implements NMSArmorSta
@Override
public int getId() {
StackTraceElement element = ReflectionUtils.getStackTraceElement(2);
if (element.getFileName().equals("EntityTrackerEntry.java") && element.getLineNumber() > 142 && element.getLineNumber() < 152) {
if (element != null && element.getFileName() != null && element.getFileName().equals("EntityTrackerEntry.java") && element.getLineNumber() > 142 && element.getLineNumber() < 152) {
// Then this method is being called when creating a new packet, we return a fake ID!
return -1;
}

2
HolographicDisplays/Plugin/com/gmail/filoghost/holographicdisplays/nms/v1_9_R2/EntityNMSArmorStand.java
View File

@ -128,7 +128,7 @@ public class EntityNMSArmorStand extends EntityArmorStand implements NMSArmorSta
@Override
public int getId() {
StackTraceElement element = ReflectionUtils.getStackTraceElement(2);
if (element.getFileName().equals("EntityTrackerEntry.java") && element.getLineNumber() > 142 && element.getLineNumber() < 152) {
if (element != null && element.getFileName() != null && element.getFileName().equals("EntityTrackerEntry.java") && element.getLineNumber() > 142 && element.getLineNumber() < 152) {
// Then this method is being called when creating a new packet, we return a fake ID!
return -1;
}

32
HolographicDisplays/Plugin/com/gmail/filoghost/holographicdisplays/util/ReflectionUtils.java
View File

@ -3,10 +3,11 @@ package com.gmail.filoghost.holographicdisplays.util;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.util.Map;
import java.util.logging.Level;
import com.gmail.filoghost.holographicdisplays.HolographicDisplays;
public class ReflectionUtils {
private static Method getStackTraceElementMethod;
@SuppressWarnings({ "rawtypes", "unchecked" })
public static void putInPrivateStaticMap(Class<?> clazz, String fieldName, Object key, Object value) throws Exception {
@ -28,6 +29,11 @@ public class ReflectionUtils {
return field.get(handle);
}
private static Method getStackTraceElementMethod;
private static Method getStackTraceDepthMethod;
private static boolean stackTraceErrorPrinted;
/**
* If you only need one stack trace element this is faster than Throwable.getStackTrace()[element],
* it doesn't generate the full stack trace.
@ -38,11 +44,25 @@ public class ReflectionUtils {
getStackTraceElementMethod = Throwable.class.getDeclaredMethod("getStackTraceElement", int.class);
getStackTraceElementMethod.setAccessible(true);
}
if (getStackTraceDepthMethod == null) {
getStackTraceDepthMethod = Throwable.class.getDeclaredMethod("getStackTraceDepth");
getStackTraceDepthMethod.setAccessible(true);
}
return (StackTraceElement) getStackTraceElementMethod.invoke(new Throwable(), index);
} catch (Exception e) {
// Fallback
return new Throwable().getStackTrace()[index];
Throwable dummyThrowable = new Throwable();
int depth = (Integer) getStackTraceDepthMethod.invoke(dummyThrowable);
if (index < depth) {
return (StackTraceElement) getStackTraceElementMethod.invoke(new Throwable(), index);
} else {
return null;
}
} catch (Throwable t) {
if (!stackTraceErrorPrinted) {
HolographicDisplays.getInstance().getLogger().log(Level.WARNING, "Unable to get a stacktrace element, please inform the developer. You will only see this error once to avoid spam.", t);
stackTraceErrorPrinted = true;
}
return null;
}
}
}