Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2025-07-12 08:08:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allow console to execute commands now that editsessions etc. accept actors

Browse Source 
- Fixes #724
 - Fixes #1044
This commit is contained in:
dordsor21
2021-09-28 15:59:52 +01:00
parent fa2f50dea8
commit 0ed98729f8
10 changed files with 104 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
worldedit-core/src/main/java/com/fastasyncworldedit/core/extension/platform/binding/ProvideBindings.java
View File

@ -46,15 +46,15 @@ public class ProvideBindings extends Bindings {
}
@Binding
public LocalSession getLocalSession(Player player) {
return getWorldEdit().getSessionManager().get(player);
public LocalSession getLocalSession(Actor actor) {
return getWorldEdit().getSessionManager().get(actor);
}
@Binding
public EditSession editSession(LocalSession localSession, Player player, InjectedValueAccess context) {
public EditSession editSession(LocalSession localSession, Actor actor, InjectedValueAccess context) {
Arguments arguments = context.injectedValue(Key.of(Arguments.class)).orElse(null);
String command = arguments == null ? null : arguments.get();
EditSession editSession = localSession.createEditSession(player, command);
EditSession editSession = localSession.createEditSession(actor, command);
editSession.enableStandardMode();
Request.request().setEditSession(editSession);
return editSession;
@ -62,8 +62,8 @@ public class ProvideBindings extends Bindings {
@Selection
@Binding
public Region selection(LocalSession localSession, Player player) {
return localSession.getSelection(player.getWorld());
public Region selection(LocalSession localSession) {
return localSession.getSelection();
}
@Binding
@ -124,8 +124,7 @@ public class ProvideBindings extends Bindings {
if (extent != null) {
return extent;
}
Player plr = getPlayer(actor);
EditSession editSession = editSession(getLocalSession(plr), plr, access);
EditSession editSession = editSession(getLocalSession(actor), actor, access);
if (access instanceof InjectedValueStore) {
InjectedValueStore store = (InjectedValueStore) access;
store.injectValue(Key.of(EditSession.class), ValueProvider.constant(editSession));