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

Fix bad/needless code

Browse Source 
- Fixes #852
This commit is contained in:
dordsor21 2021-01-14 12:39:57 +00:00
parent fd1ed63703
commit ac73478827
No known key found for this signature in database
GPG Key ID: 1E53E88969FFCF0B
1 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -155,11 +155,9 @@ 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...
Field f = MemoizingValueAccess.class.getDeclaredField("memory"); Map<Key<?>, Optional<?>> memory = (Map<Key<?>, Optional<?>>) Reflect.memory.get(context);
f.setAccessible(true); memory.put(Key.of(InterruptableCondition.class), Optional.of(wait));
Map<Key<?>, Optional<?>> memory = (Map<Key<?>, Optional<?>>) f.get(context); } catch (IllegalAccessException e) {
memory.put(Key.of(ReentrantLock.class), Optional.of(lock));
} catch (NoSuchFieldException | IllegalAccessException e) {
e.printStackTrace(); e.printStackTrace();
} }
// Waits till 15 seconds then returns false unless awakened // Waits till 15 seconds then returns false unless awakened
@ -176,21 +174,25 @@ public @interface Confirm {
} }
boolean checkExisting(InjectedValueAccess context) { boolean checkExisting(InjectedValueAccess context) {
Optional<ReentrantLock> lock = context.injectedValue(Key.of(ReentrantLock.class)); Optional<InterruptableCondition> lock = context.injectedValue(Key.of(InterruptableCondition.class));
// lock if locked will be held by current thread unless something has gone REALLY wrong
// in which case this is the least of our worries...
return lock.isPresent();
}
}
class Reflect {
static final Field memory;
static {
Field f;
try { try {
// This is really dumb but also stops the double //confirm requirement... f = MemoizingValueAccess.class.getDeclaredField("memory");
Field f = MemoizingValueAccess.class.getDeclaredField("memory");
f.setAccessible(true); f.setAccessible(true);
Map<Key<?>, Optional<?>> memory = (Map<Key<?>, Optional<?>>) f.get(context); } catch (NoSuchFieldException e) {
} catch (NoSuchFieldException | IllegalAccessException e) {
e.printStackTrace(); e.printStackTrace();
f = null;
} }
if (lock.isPresent()) { memory = f;
// lock if locked will be held by current thread unless something has gone REALLY wrong
// in which case this is the least of our worries...
return true;
}
return false;
} }
} }
} }