From 7fb3899bb71f5b7458e29b5c8ef142ffbc02784f Mon Sep 17 00:00:00 2001
From: Jesse Boyd <jessepaleg@gmail.com>
Date: Mon, 13 Aug 2018 03:31:26 +1000
Subject: [PATCH] Use BlockState for player inventory getBlock

---
 .../java/com/boydti/fawe/bukkit/adapter/Spigot_v1_13_R1.java   | 3 +--
 .../src/main/java/com/boydti/fawe/wrappers/PlayerWrapper.java  | 2 +-
 .../sk89q/worldedit/extension/factory/DefaultBlockParser.java  | 2 +-
 .../com/sk89q/worldedit/extension/platform/PlayerProxy.java    | 2 +-
 .../com/sk89q/worldedit/world/snapshot/SnapshotRestore.java    | 2 +-
 5 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/adapter/Spigot_v1_13_R1.java b/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/adapter/Spigot_v1_13_R1.java
index d1c061c5c..56c350f96 100644
--- a/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/adapter/Spigot_v1_13_R1.java
+++ b/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/adapter/Spigot_v1_13_R1.java
@@ -21,7 +21,6 @@ package com.boydti.fawe.bukkit.adapter;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
-import ignore.test.DummyServer;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Maps;
 import com.sk89q.jnbt.ByteArrayTag;
@@ -113,7 +112,7 @@ public final class Spigot_v1_13_R1 implements BukkitImplAdapter<NBTBase> {
 
     public Spigot_v1_13_R1() throws NoSuchFieldException, NoSuchMethodException {
         // A simple test
-        if (Bukkit.getServer().getClass() != DummyServer.class) CraftServer.class.cast(Bukkit.getServer());
+        if (!Bukkit.getServer().getClass().getName().endsWith("DummyServer")) CraftServer.class.cast(Bukkit.getServer());
         // test between 1.12 and 1.12.1 since md_5 didn't update revision numbers
         TileEntity.class.getDeclaredMethod("load", NBTTagCompound.class);
 
diff --git a/worldedit-core/src/main/java/com/boydti/fawe/wrappers/PlayerWrapper.java b/worldedit-core/src/main/java/com/boydti/fawe/wrappers/PlayerWrapper.java
index a2a995b9c..30be0e7f5 100644
--- a/worldedit-core/src/main/java/com/boydti/fawe/wrappers/PlayerWrapper.java
+++ b/worldedit-core/src/main/java/com/boydti/fawe/wrappers/PlayerWrapper.java
@@ -50,7 +50,7 @@ public class PlayerWrapper extends AbstractPlayerActor {
     }
 
     @Override
-    public BaseBlock getBlockInHand(HandSide handSide) throws WorldEditException {
+    public BlockState getBlockInHand(HandSide handSide) throws WorldEditException {
         return parent.getBlockInHand(handSide);
     }
 
diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/extension/factory/DefaultBlockParser.java b/worldedit-core/src/main/java/com/sk89q/worldedit/extension/factory/DefaultBlockParser.java
index f4f25d162..ca4244c75 100644
--- a/worldedit-core/src/main/java/com/sk89q/worldedit/extension/factory/DefaultBlockParser.java
+++ b/worldedit-core/src/main/java/com/sk89q/worldedit/extension/factory/DefaultBlockParser.java
@@ -60,7 +60,7 @@ public class DefaultBlockParser extends InputParser<BlockStateHolder> {
         super(worldEdit);
     }
 
-    private static BaseBlock getBlockInHand(Actor actor, HandSide handSide) throws InputParseException {
+    private static BlockState getBlockInHand(Actor actor, HandSide handSide) throws InputParseException {
         if (actor instanceof Player) {
             try {
                 return ((Player) actor).getBlockInHand(handSide);
diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/extension/platform/PlayerProxy.java b/worldedit-core/src/main/java/com/sk89q/worldedit/extension/platform/PlayerProxy.java
index d4fccdd2d..dfc18b3ec 100644
--- a/worldedit-core/src/main/java/com/sk89q/worldedit/extension/platform/PlayerProxy.java
+++ b/worldedit-core/src/main/java/com/sk89q/worldedit/extension/platform/PlayerProxy.java
@@ -65,7 +65,7 @@ public class PlayerProxy extends AbstractPlayerActor {
 
 
     @Override
-    public BaseBlock getBlockInHand(HandSide handSide) throws WorldEditException {
+    public BlockState getBlockInHand(HandSide handSide) throws WorldEditException {
         return basePlayer.getBlockInHand(handSide);
     }
 
diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/world/snapshot/SnapshotRestore.java b/worldedit-core/src/main/java/com/sk89q/worldedit/world/snapshot/SnapshotRestore.java
index 2a40484a0..c8b031d59 100644
--- a/worldedit-core/src/main/java/com/sk89q/worldedit/world/snapshot/SnapshotRestore.java
+++ b/worldedit-core/src/main/java/com/sk89q/worldedit/world/snapshot/SnapshotRestore.java
@@ -149,7 +149,7 @@ public class SnapshotRestore {
                 // Now just copy blocks!
                 for (Vector pos : entry.getValue()) {
                     try {
-                        BaseBlock block = chunk.getBlock(pos);
+                        BlockState block = chunk.getBlock(pos);
                         editSession.setBlock(pos, block);
                     } catch (DataException e) {
                         // this is a workaround: just ignore for now