Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2024-12-23 01:37:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed an issue where a block had to be clicked for WorldEdit to receive event information

Browse Source
This commit is contained in:
Wyatt Childers 2016-05-01 13:39:09 -04:00
parent 330523bac4
commit 96798bbb90
1 changed files with 31 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongeWorldEdit.java
View File

@ -43,6 +43,8 @@ import org.spongepowered.api.item.inventory.ItemStack;
import org.spongepowered.api.plugin.Plugin; import org.spongepowered.api.plugin.Plugin;
import org.spongepowered.api.plugin.PluginContainer; import org.spongepowered.api.plugin.PluginContainer;
import org.spongepowered.api.scheduler.Task; import org.spongepowered.api.scheduler.Task;
import org.spongepowered.api.text.Text;
import org.spongepowered.api.text.channel.MessageChannel;
import org.spongepowered.api.world.Location; import org.spongepowered.api.world.Location;
import org.spongepowered.api.world.World; import org.spongepowered.api.world.World;
@ -136,6 +138,8 @@ public class SpongeWorldEdit {
WorldEdit.getInstance().getEventBus().post(new PlatformReadyEvent()); WorldEdit.getInstance().getEventBus().post(new PlatformReadyEvent());
} }
private boolean ignoreLeftClickAir = false;
@Listener @Listener
public void onPlayerInteract(InteractBlockEvent event) { public void onPlayerInteract(InteractBlockEvent event) {
if (platform == null) { if (platform == null) {
@ -156,15 +160,14 @@ public class SpongeWorldEdit {
BlockSnapshot targetBlock = event.getTargetBlock(); BlockSnapshot targetBlock = event.getTargetBlock();
Optional<Location<World>> optLoc = targetBlock.getLocation(); Optional<Location<World>> optLoc = targetBlock.getLocation();
if (!optLoc.isPresent()) {
return;
}
Location<World> loc = optLoc.get();
BlockType interactedType = targetBlock.getState().getType(); BlockType interactedType = targetBlock.getState().getType();
if (event instanceof InteractBlockEvent.Primary) { if (event instanceof InteractBlockEvent.Primary) {
if (interactedType != BlockTypes.AIR) { if (interactedType != BlockTypes.AIR) {
if (!optLoc.isPresent()) {
return;
}
Location<World> loc = optLoc.get();
WorldVector pos = new WorldVector(LocalWorldAdapter.adapt(world), loc.getX(), loc.getY(), loc.getZ()); WorldVector pos = new WorldVector(LocalWorldAdapter.adapt(world), loc.getX(), loc.getY(), loc.getZ());
if (we.handleBlockLeftClick(player, pos)) { if (we.handleBlockLeftClick(player, pos)) {
@ -174,9 +177,31 @@ public class SpongeWorldEdit {
if (we.handleArmSwing(player)) { if (we.handleArmSwing(player)) {
event.setCancelled(true); event.setCancelled(true);
} }
if (!ignoreLeftClickAir) {
Task.builder().delayTicks(2).execute(() -> {
ignoreLeftClickAir = false;
}).submit(this);
ignoreLeftClickAir = true;
}
} else {
if (ignoreLeftClickAir) {
return;
}
if (we.handleArmSwing(player)) {
event.setCancelled(true);
}
} }
} else if (event instanceof InteractBlockEvent.Secondary) { } else if (event instanceof InteractBlockEvent.Secondary) {
if (interactedType != BlockTypes.AIR) { if (interactedType != BlockTypes.AIR) {
if (!optLoc.isPresent()) {
return;
}
Location<World> loc = optLoc.get();
WorldVector pos = new WorldVector(LocalWorldAdapter.adapt(world), loc.getX(), loc.getY(), loc.getZ()); WorldVector pos = new WorldVector(LocalWorldAdapter.adapt(world), loc.getX(), loc.getY(), loc.getZ());
if (we.handleBlockRightClick(player, pos)) { if (we.handleBlockRightClick(player, pos)) {