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

Use ItemInteract for item right clicks in Sponge.

Browse Source 
They don't fire for InteractBlock.

# Conflicts:
#	worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongeWorldEdit.java
This commit is contained in:
wizjany 2019-06-06 13:22:18 -04:00
parent 351fd6771a
commit 8022d8e911
1 changed files with 28 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -51,6 +51,7 @@ import org.spongepowered.api.event.game.state.GamePostInitializationEvent;
import org.spongepowered.api.event.game.state.GamePreInitializationEvent; import org.spongepowered.api.event.game.state.GamePreInitializationEvent;
import org.spongepowered.api.event.game.state.GameStartedServerEvent; import org.spongepowered.api.event.game.state.GameStartedServerEvent;
import org.spongepowered.api.event.game.state.GameStoppingServerEvent; import org.spongepowered.api.event.game.state.GameStoppingServerEvent;
import org.spongepowered.api.event.item.inventory.InteractItemEvent;
import org.spongepowered.api.item.ItemType; import org.spongepowered.api.item.ItemType;
import org.spongepowered.api.item.inventory.ItemStack; import org.spongepowered.api.item.inventory.ItemStack;
import org.spongepowered.api.plugin.Plugin; import org.spongepowered.api.plugin.Plugin;
@ -204,6 +205,22 @@ public class SpongeWorldEdit {
return this.spongeAdapter; return this.spongeAdapter;
} }
@Listener
public void onPlayerItemInteract(InteractItemEvent event, @Root Player spongePlayer) {
if (platform == null) {
return;
}
if (!platform.isHookingEvents()) return; // We have to be told to catch these events
WorldEdit we = WorldEdit.getInstance();
SpongePlayer player = wrapPlayer(spongePlayer);
if (we.handleRightClick(player)) {
event.setCancelled(true);
}
}
@Listener @Listener
public void onPlayerInteract(InteractBlockEvent event, @Root Player spongePlayer) { public void onPlayerInteract(InteractBlockEvent event, @Root Player spongePlayer) {
if (platform == null) { if (platform == null) {
@ -244,26 +261,20 @@ public class SpongeWorldEdit {
} }
} }
} else if (event instanceof InteractBlockEvent.Secondary) { } else if (event instanceof InteractBlockEvent.Secondary) {
if (interactedType != BlockTypes.AIR) { if (!optLoc.isPresent()) {
if (!optLoc.isPresent()) { return;
return; }
}
Location<World> loc = optLoc.get(); Location<World> loc = optLoc.get();
com.sk89q.worldedit.util.Location pos = new com.sk89q.worldedit.util.Location( com.sk89q.worldedit.util.Location pos = new com.sk89q.worldedit.util.Location(
world, loc.getX(), loc.getY(), loc.getZ()); world, loc.getX(), loc.getY(), loc.getZ());
if (we.handleBlockRightClick(player, pos)) { if (we.handleBlockRightClick(player, pos)) {
event.setCancelled(true); event.setCancelled(true);
} }
if (we.handleRightClick(player)) { if (we.handleRightClick(player)) {
event.setCancelled(true); event.setCancelled(true);
}
} else {
if (we.handleRightClick(player)) {
event.setCancelled(true);
}
} }
} }
} }