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

Remove stub injector methods

Browse Source
This commit is contained in:
Jesse Boyd
2018-08-13 02:36:39 +10:00
parent fa06ff357e
commit e7c27b08bf
124 changed files with 241 additions and 411 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitAdapter.java
View File

@ -221,8 +221,6 @@ public class BukkitAdapter {
return Material.getMaterial(itemType.getId().replace("minecraft:", "").toUpperCase());
}
private static boolean test;
/**
* Create a Bukkit Material form a WorldEdit BlockType
*
@ -314,7 +312,7 @@ public class BukkitAdapter {
* @param itemStack The Bukkit ItemStack
* @return The WorldEdit BlockState
*/
public static BlockStateHolder asBlockState(ItemStack itemStack) {
public static BlockState asBlockState(ItemStack itemStack) {
checkNotNull(itemStack);
if (itemStack.getType().isBlock()) {
return adapt(itemStack.getType().createBlockData());

5
worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitPlayer.java
View File

@ -34,6 +34,7 @@ import com.sk89q.worldedit.util.HandSide;
import com.sk89q.worldedit.world.World;
import com.sk89q.worldedit.world.gamemode.GameMode;
import com.sk89q.worldedit.world.gamemode.GameModes;
import jdk.nashorn.internal.ir.Block;
import org.bukkit.Bukkit;
import org.bukkit.Location;
import org.bukkit.entity.Player;
@ -67,11 +68,11 @@ public class BukkitPlayer extends AbstractPlayerActor {
}
@Override
public BaseBlock getBlockInHand(HandSide handSide) throws WorldEditException {
public BlockState getBlockInHand(HandSide handSide) throws WorldEditException {
ItemStack itemStack = handSide == HandSide.MAIN_HAND
? player.getInventory().getItemInMainHand()
: player.getInventory().getItemInOffHand();
return new BaseBlock(BukkitAdapter.asBlockState(itemStack));
return BukkitAdapter.asBlockState(itemStack);
}
@Override