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

Actor should not have getWorld().

Browse Source
This commit is contained in:
sk89q 2014-06-27 18:34:58 -07:00
parent 23ce159ccf
commit 9381beb417
5 changed files with 10 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/bukkit/java/com/sk89q/worldedit/bukkit/BukkitCommandSender.java
View File

@ -117,9 +117,4 @@ class BukkitCommandSender implements Actor {
public void dispatchCUIEvent(CUIEvent event) {
}
@Override
public LocalWorld getWorld() {
throw new PlayerNeededException();
}
}

7
src/main/java/com/sk89q/worldedit/extension/platform/Actor.java
View File

@ -37,13 +37,6 @@ public interface Actor {
*/
String getName();
/**
* Get the actor's world.
*
* @return the world
*/
World getWorld();
/**
* Print a message.
*

2
src/main/java/com/sk89q/worldedit/extension/platform/PlatformManager.java
View File

@ -240,7 +240,7 @@ public class PlatformManager {
permActor = player;
}
return (T) new PlayerProxy(player, permActor, getWorldForEditing(base.getWorld()));
return (T) new PlayerProxy(player, permActor, getWorldForEditing(player.getWorld()));
} else {
return base;
}

4
src/main/java/com/sk89q/worldedit/internal/command/CommandLoggingHandler.java
View File

@ -89,7 +89,7 @@ public class CommandLoggingHandler extends AbstractInvokeListener implements Inv
builder.append("WorldEdit: ").append(sender.getName());
if (sender.isPlayer()) {
builder.append(" (in \"" + sender.getWorld().getName() + "\")");
builder.append(" (in \"" + player.getWorld().getName() + "\")");
}
builder.append(": ").append(context.getCommand());
@ -126,7 +126,7 @@ public class CommandLoggingHandler extends AbstractInvokeListener implements Inv
case REGION:
try {
builder.append(" - Region: ")
.append(session.getSelection(sender.getWorld()));
.append(session.getSelection(player.getWorld()));
} catch (IncompleteRegionException e) {
break;
}

9
src/main/java/com/sk89q/worldedit/internal/command/WorldEditBinding.java
View File

@ -20,6 +20,7 @@
package com.sk89q.worldedit.internal.command;
import com.sk89q.worldedit.*;
import com.sk89q.worldedit.entity.Entity;
import com.sk89q.worldedit.entity.Player;
import com.sk89q.worldedit.extension.input.ParserContext;
import com.sk89q.worldedit.extension.platform.Actor;
@ -169,7 +170,9 @@ public class WorldEditBinding extends BindingHelper {
Actor actor = context.getContext().getLocals().get(Actor.class);
ParserContext parserContext = new ParserContext();
parserContext.setActor(context.getContext().getLocals().get(Actor.class));
parserContext.setWorld(actor.getWorld());
if (actor instanceof Entity) {
parserContext.setWorld(((Entity) actor).getWorld());
}
parserContext.setSession(worldEdit.getSessionManager().get(actor));
return worldEdit.getPatternRegistry().parseFromInput(context.next(), parserContext);
}
@ -189,7 +192,9 @@ public class WorldEditBinding extends BindingHelper {
Actor actor = context.getContext().getLocals().get(Actor.class);
ParserContext parserContext = new ParserContext();
parserContext.setActor(context.getContext().getLocals().get(Actor.class));
parserContext.setWorld(actor.getWorld());
if (actor instanceof Entity) {
parserContext.setWorld(((Entity) actor).getWorld());
}
parserContext.setSession(worldEdit.getSessionManager().get(actor));
return worldEdit.getMaskRegistry().parseFromInput(context.next(), parserContext);
}