Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2024-12-23 01:37:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix confirm for some commands that give AutoValue_CommandParametersImpl from the getgo

Browse Source
This commit is contained in:
dordsor21 2021-01-14 20:08:43 +00:00
parent bad3d31d90
commit b450a0af80
No known key found for this signature in database
GPG Key ID: 1E53E88969FFCF0B
1 changed files with 30 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
worldedit-core/src/main/java/com/sk89q/worldedit/command/util/annotation/Confirm.java
View File

@ -20,6 +20,8 @@ import org.enginehub.piston.inject.InjectAnnotation;
import org.enginehub.piston.inject.InjectedValueAccess; import org.enginehub.piston.inject.InjectedValueAccess;
import org.enginehub.piston.inject.Key; import org.enginehub.piston.inject.Key;
import org.enginehub.piston.inject.MemoizingValueAccess; import org.enginehub.piston.inject.MemoizingValueAccess;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.lang.annotation.ElementType; import java.lang.annotation.ElementType;
import java.lang.annotation.Retention; import java.lang.annotation.Retention;
@ -155,7 +157,17 @@ public @interface Confirm {
actor.setMeta("cmdConfirm", wait); actor.setMeta("cmdConfirm", wait);
try { try {
// This is really dumb but also stops the double //confirm requirement... // This is really dumb but also stops the double //confirm requirement...
Map<Key<?>, Optional<?>> memory = (Map<Key<?>, Optional<?>>) Reflect.memory.get(context); final MemoizingValueAccess memoizingValueAccess;
if (!(context instanceof MemoizingValueAccess)) {
if (!context.getClass().getSimpleName().contains("AutoValue_CommandParametersImpl")) {
LoggerFactory.getLogger(Confirm.class).warn("InjectedValueAccess " + context.getClass().getName() + " given to Confirm");
return true;
}
memoizingValueAccess = (MemoizingValueAccess) Reflect.injectedValues.get(context);
} else {
memoizingValueAccess = (MemoizingValueAccess) context;
}
Map<Key<?>, Optional<?>> memory = (Map<Key<?>, Optional<?>>) Reflect.memory.get(memoizingValueAccess);
memory.put(Key.of(InterruptableCondition.class), Optional.of(wait)); memory.put(Key.of(InterruptableCondition.class), Optional.of(wait));
} catch (IllegalAccessException e) { } catch (IllegalAccessException e) {
e.printStackTrace(); e.printStackTrace();
@ -183,16 +195,28 @@ public @interface Confirm {
class Reflect { class Reflect {
static final Field memory; static final Field memory;
static final Field injectedValues;
static { static {
Field f; Field memoryField;
try { try {
f = MemoizingValueAccess.class.getDeclaredField("memory"); memoryField = MemoizingValueAccess.class.getDeclaredField("memory");
f.setAccessible(true); memoryField.setAccessible(true);
} catch (NoSuchFieldException e) { } catch (NoSuchFieldException e) {
e.printStackTrace(); e.printStackTrace();
f = null; memoryField = null;
} }
memory = f; memory = memoryField;
Field injectedValuesField;
try {
Class<?> c = Class.forName("org.enginehub.piston.impl.AutoValue_CommandParametersImpl");
injectedValuesField = c.getDeclaredField("injectedValues");
injectedValuesField.setAccessible(true);
} catch (NoSuchFieldException | ClassNotFoundException e) {
e.printStackTrace();
injectedValuesField = null;
}
injectedValues = injectedValuesField;
} }
} }
} }