Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2025-07-04 03:56:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup the bukkit implementation, and update to the 1.13 release items/blocks.

Browse Source
This commit is contained in:
Matthew Miller
2018-07-19 12:55:02 +10:00
parent c3d832c3fd
commit 572bf04482
20 changed files with 17201 additions and 16340 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -61,7 +61,7 @@ public class BukkitPlayer extends AbstractPlayerActor {
ItemStack itemStack = handSide == HandSide.MAIN_HAND
? player.getInventory().getItemInMainHand()
: player.getInventory().getItemInOffHand();
return BukkitUtil.toBaseItemStack(itemStack);
return BukkitAdapter.adapt(itemStack);
}
@Override
@ -69,7 +69,7 @@ public class BukkitPlayer extends AbstractPlayerActor {
ItemStack itemStack = handSide == HandSide.MAIN_HAND
? player.getInventory().getItemInMainHand()
: player.getInventory().getItemInOffHand();
return new BaseBlock(BukkitUtil.toBlock(itemStack));
return new BaseBlock(BukkitAdapter.asBlockState(itemStack));
}
@Override
@ -79,7 +79,7 @@ public class BukkitPlayer extends AbstractPlayerActor {
@Override
public void giveItem(BaseItemStack itemStack) {
player.getInventory().addItem(BukkitUtil.toItemStack(itemStack));
player.getInventory().addItem(BukkitAdapter.adapt(itemStack));
}
@Override
@ -135,7 +135,7 @@ public class BukkitPlayer extends AbstractPlayerActor {
@Override
public World getWorld() {
return BukkitUtil.getWorld(player.getWorld());
return BukkitAdapter.adapt(player.getWorld());
}
@Override
@ -176,7 +176,7 @@ public class BukkitPlayer extends AbstractPlayerActor {
@Override
public com.sk89q.worldedit.util.Location getLocation() {
Location nativeLocation = player.getLocation();
Vector position = BukkitUtil.toVector(nativeLocation);
Vector position = BukkitAdapter.asVector(nativeLocation);
return new com.sk89q.worldedit.util.Location(
getWorld(),
position,