Limework/skript-db
2
2
Fork 3
Code Issues 4 Pull Requests 1 Projects Releases 14 Wiki Activity

Skript 2.8+ unsafe Fix #29

Open
rigbot2 wants to merge 1 commits from rigbot2/skript-db:master into master
pull from: rigbot2/skript-db:master
merge into: Limework:master
Conversation 0 Commits 1 Files Changed 1 +72 -81
1 changed files with 72 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

111
src/main/java/com/btk5h/skriptdb/SkriptUtil.java
View File

@ -1,94 +1,85 @@
package com.btk5h.skriptdb; package com.btk5h.skriptdb;
import ch.njol.skript.Skript;
import ch.njol.skript.lang.Expression;
import ch.njol.skript.lang.VariableString;
import java.lang.reflect.Field; import java.lang.reflect.Field;
import java.util.Arrays; import java.util.Arrays;
import java.util.Optional; import java.util.Optional;
import org.bukkit.event.Event;
import ch.njol.skript.ScriptLoader;
import ch.njol.skript.Skript;
import ch.njol.skript.lang.Expression;
import ch.njol.skript.lang.VariableString;
import ch.njol.skript.lang.parser.ParserInstance;
public class SkriptUtil { public class SkriptUtil {
private static final Field STRING; private static final Field STRING;
private static final Field EXPR; private static final Field EXPR;
static { static {
STRING = tryGetOldStringField() Field stringField = null;
.or(() -> tryGetNewStringField()) Field exprField = null;
.orElseGet(() -> {
Skript.error("Skript's 'string' field could not be resolved."); String[] possibleStringFields = {"string", "stringValue", "rawString"};
return null; for (String fieldName : possibleStringFields) {
}); try {
stringField = VariableString.class.getDeclaredField(fieldName);
stringField.setAccessible(true);
break;
} catch (NoSuchFieldException ignored) {}
}
if (stringField == null) {
for (Field field : VariableString.class.getDeclaredFields()) {
if (field.getType().isArray() && field.getType().getComponentType() == Object.class) {
try {
field.setAccessible(true);
stringField = field;
break;
} catch (SecurityException ignored) {}
}
}
}
Field f = null;
try { try {
Optional<Class<?>> expressionInfo = Arrays.stream(VariableString.class.getDeclaredClasses()) Optional<Class<?>> expressionInfo = Arrays.stream(VariableString.class.getDeclaredClasses())
.filter(cls -> cls.getSimpleName().equals("ExpressionInfo")) .filter(cls -> cls.getSimpleName().equals("ExpressionInfo"))
.findFirst(); .findFirst();
if (expressionInfo.isPresent()) { if (expressionInfo.isPresent()) {
Class<?> expressionInfoClass = expressionInfo.get(); Class<?> expressionInfoClass = expressionInfo.get();
f = expressionInfoClass.getDeclaredField("expr"); try {
f.setAccessible(true); exprField = expressionInfoClass.getDeclaredField("expr");
} else { exprField.setAccessible(true);
Skript.error("Skript's 'ExpressionInfo' class could not be resolved.");
}
} catch (NoSuchFieldException e) { } catch (NoSuchFieldException e) {
e.printStackTrace(); for (Field field : expressionInfoClass.getDeclaredFields()) {
Skript.error("Skript's 'expr' field could not be resolved."); if (Expression.class.isAssignableFrom(field.getType())) {
field.setAccessible(true);
exprField = field;
break;
}
}
}
}
} catch (Exception ignored) {}
STRING = stringField;
EXPR = exprField;
if (STRING == null && EXPR == null) {
Skript.error("Failed to initialize SkriptUtil: Could not find required fields");
} }
EXPR = f;
} }
public static Object[] getTemplateString(VariableString vs) { public static Object[] getTemplateString(VariableString vs) {
try { try {
return (Object[]) STRING.get(vs); return STRING != null ? (Object[]) STRING.get(vs) : new Object[]{vs.toString()};
} catch (IllegalAccessException e) { } catch (IllegalAccessException e) {
throw new RuntimeException(e); return new Object[]{vs.toString()};
} }
} }
public static Expression<?> getExpressionFromInfo(Object o) { public static Expression<?> getExpressionFromInfo(Object o) {
try { try {
return (Expression<?>) EXPR.get(o); return EXPR != null ? (Expression<?>) EXPR.get(o) : null;
} catch (IllegalAccessException e) { } catch (IllegalAccessException e) {
throw new RuntimeException(e); return null;
} }
} }
@SuppressWarnings("deprecation")
public static boolean isCurrentEvent(Class<? extends Event> event) {
try {
Class.forName("ch.njol.skript.lang.parser.ParserInstance");
return ParserInstance.get().isCurrentEvent(event);
} catch (ClassNotFoundException e) {
return ScriptLoader.isCurrentEvent(event);
}
}
private static Optional<Field> tryGetOldStringField() {
try {
Field f = VariableString.class.getDeclaredField("string");
f.setAccessible(true);
return Optional.of(f);
} catch (NoSuchFieldException e) {
return Optional.empty();
}
}
private static Optional<Field> tryGetNewStringField() {
try {
Field f = VariableString.class.getDeclaredField("strings");
f.setAccessible(true);
return Optional.of(f);
} catch (NoSuchFieldException e) {
return Optional.empty();
}
}
} }