Brandon/FastAsyncWorldedit
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Real Nukkit 1.1 Fix

Browse Source
This commit is contained in:
Goodstuff4UonYT 2017-06-11 18:58:19 +02:00
parent 0f3138e894
commit 0c7ed30026
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
nukkit/src/main/java/com/boydti/fawe/nukkit/core/WorldEditListener.java
View File

@ -31,6 +31,8 @@ import cn.nukkit.event.player.PlayerChatEvent;
import cn.nukkit.event.player.PlayerCommandPreprocessEvent; import cn.nukkit.event.player.PlayerCommandPreprocessEvent;
import cn.nukkit.event.player.PlayerGameModeChangeEvent; import cn.nukkit.event.player.PlayerGameModeChangeEvent;
import cn.nukkit.event.player.PlayerInteractEvent; import cn.nukkit.event.player.PlayerInteractEvent;
import cn.nukkit.event.player.PlayerInteractEvent.Action;
import com.google.common.base.Joiner; import com.google.common.base.Joiner;
import com.sk89q.util.StringUtil; import com.sk89q.util.StringUtil;
import com.sk89q.worldedit.LocalPlayer; import com.sk89q.worldedit.LocalPlayer;
@ -142,8 +144,8 @@ public class WorldEditListener implements Listener {
final World world = player.getWorld(); final World world = player.getWorld();
final WorldEdit we = WorldEdit.getInstance(); final WorldEdit we = WorldEdit.getInstance();
int action = event.getAction(); Action action = event.getAction();
if (action == PlayerInteractEvent.LEFT_CLICK_BLOCK) { if (action == PlayerInteractEvent.Action.LEFT_CLICK_BLOCK) {
final Block clickedBlock = event.getBlock(); final Block clickedBlock = event.getBlock();
final WorldVector pos = new WorldVector(LocalWorldAdapter.adapt(world), clickedBlock.getX(), clickedBlock.getY(), clickedBlock.getZ()); final WorldVector pos = new WorldVector(LocalWorldAdapter.adapt(world), clickedBlock.getX(), clickedBlock.getY(), clickedBlock.getZ());
@ -155,13 +157,13 @@ public class WorldEditListener implements Listener {
event.setCancelled(true); event.setCancelled(true);
} }
} else if (action == PlayerInteractEvent.LEFT_CLICK_AIR) { } else if (action == PlayerInteractEvent.Action.LEFT_CLICK_AIR) {
if (we.handleArmSwing(player)) { if (we.handleArmSwing(player)) {
event.setCancelled(true); event.setCancelled(true);
} }
} else if (action == PlayerInteractEvent.RIGHT_CLICK_BLOCK) { } else if (action == PlayerInteractEvent.Action.RIGHT_CLICK_BLOCK) {
final Block clickedBlock = event.getBlock(); final Block clickedBlock = event.getBlock();
final WorldVector pos = new WorldVector(LocalWorldAdapter.adapt(world), clickedBlock.getX(), final WorldVector pos = new WorldVector(LocalWorldAdapter.adapt(world), clickedBlock.getX(),
clickedBlock.getY(), clickedBlock.getZ()); clickedBlock.getY(), clickedBlock.getZ());
@ -173,7 +175,7 @@ public class WorldEditListener implements Listener {
if (we.handleRightClick(player)) { if (we.handleRightClick(player)) {
event.setCancelled(true); event.setCancelled(true);
} }
} else if (action == PlayerInteractEvent.RIGHT_CLICK_AIR) { } else if (action == PlayerInteractEvent.Action.RIGHT_CLICK_AIR) {
if (we.handleRightClick(player)) { if (we.handleRightClick(player)) {
event.setCancelled(true); event.setCancelled(true);
} }

2
nukkit/src/main/java/com/boydti/fawe/nukkit/listener/BrushListener.java
View File

@ -76,7 +76,7 @@ public class BrushListener implements Listener {
public void onPlayerInteract(final PlayerInteractEvent event) { public void onPlayerInteract(final PlayerInteractEvent event) {
Player nukkitPlayer = event.getPlayer(); Player nukkitPlayer = event.getPlayer();
if (nukkitPlayer.isSneaking()) { if (nukkitPlayer.isSneaking()) {
if (event.getAction() == PlayerInteractEvent.PHYSICAL) { if (event.getAction() == PlayerInteractEvent.Action.PHYSICAL) {
return; return;
} }
FawePlayer<Object> fp = FawePlayer.wrap(nukkitPlayer); FawePlayer<Object> fp = FawePlayer.wrap(nukkitPlayer);