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

Use our own firstNonNull to maintain back-compat.

Browse Source 
Fixes WORLDEDIT-3567.
This commit is contained in:
wizjany
2017-05-22 16:00:50 -04:00
parent 3cf018f14a
commit 46dff16a97
7 changed files with 41 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
worldedit-core/src/main/java/com/sk89q/worldedit/function/factory/Apply.java
View File

@ -27,8 +27,8 @@ import com.sk89q.worldedit.function.visitor.RegionVisitor;
import com.sk89q.worldedit.regions.NullRegion;
import com.sk89q.worldedit.regions.Region;
import static com.google.common.base.Objects.firstNonNull;
import static com.google.common.base.Preconditions.checkNotNull;
import static com.sk89q.worldedit.util.GuavaUtil.firstNonNull;
public class Apply implements Contextual<Operation> {

4
worldedit-core/src/main/java/com/sk89q/worldedit/function/factory/Deform.java
View File

@ -19,7 +19,6 @@
package com.sk89q.worldedit.function.factory;
import com.google.common.base.Objects;
import com.sk89q.worldedit.EditSession;
import com.sk89q.worldedit.Vector;
import com.sk89q.worldedit.WorldEditException;
@ -36,6 +35,7 @@ import com.sk89q.worldedit.regions.Region;
import java.util.List;
import static com.google.common.base.Preconditions.checkNotNull;
import static com.sk89q.worldedit.util.GuavaUtil.firstNonNull;
public class Deform implements Contextual<Operation> {
@ -123,7 +123,7 @@ public class Deform implements Contextual<Operation> {
final Vector zero;
Vector unit;
Region region = Objects.firstNonNull(context.getRegion(), this.region);
Region region = firstNonNull(context.getRegion(), this.region);
switch (mode) {
case UNIT_CUBE:

2
worldedit-core/src/main/java/com/sk89q/worldedit/function/factory/Paint.java
View File

@ -33,9 +33,9 @@ import com.sk89q.worldedit.math.noise.RandomNoise;
import com.sk89q.worldedit.regions.NullRegion;
import com.sk89q.worldedit.regions.Region;
import static com.google.common.base.Objects.firstNonNull;
import static com.google.common.base.Preconditions.checkNotNull;
import static com.sk89q.worldedit.regions.Regions.*;
import static com.sk89q.worldedit.util.GuavaUtil.firstNonNull;
public class Paint implements Contextual<Operation> {