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

Merge remote-tracking branch 'refs/remotes/sk89q/master'

Browse Source 
# Conflicts:

#	worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitWorld.java
#	worldedit-core/src/main/java/com/sk89q/worldedit/blocks/BaseBlock.java
#	worldedit-core/src/main/java/com/sk89q/worldedit/world/NullWorld.java
This commit is contained in:
Jesse Boyd
2018-08-15 14:02:51 +10:00
parent db65e96700 c31161d068
commit a67441bbff
24 changed files with 943 additions and 230 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
worldedit-core/src/main/java/com/sk89q/worldedit/session/request/Request.java
View File

@ -21,6 +21,8 @@ package com.sk89q.worldedit.session.request;
import com.sk89q.worldedit.EditSession;
import com.sk89q.worldedit.LocalSession;
import com.sk89q.worldedit.entity.Player;
import com.sk89q.worldedit.extension.platform.Actor;
import com.sk89q.worldedit.extent.Extent;
import com.sk89q.worldedit.world.World;
import javax.annotation.Nullable;
@ -37,6 +39,9 @@ public final class Request {
World world;
private
@Nullable
Actor actor;
private
@Nullable
LocalSession session;
private
@Nullable
@ -81,6 +86,15 @@ public final class Request {
return null;
}
@Nullable
public Actor getActor() {
return actor;
}
public void setActor(@Nullable Actor actor) {
this.actor = actor;
}
/**
* Get the request session.
*