Upstream
/
ChestShop-3
mirror of https://github.com/ChestShop-authors/ChestShop-3.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Add workaround for adventure mode not firing the interact on left click 

This still has an issue: It leads to the selling to be fired even when a player isn't directly at the sign but just into the block the sign is in.
This commit is contained in:
Phoenix616 2017-07-04 16:53:44 +01:00
parent 2e7613ae9c
commit d82faa1f7a
1 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/main/java/com/Acrobot/ChestShop/Listeners/Player/PlayerInteract.java
View File

@ -22,14 +22,19 @@ import org.bukkit.block.Block;
import org.bukkit.block.Chest;
import org.bukkit.block.Sign;
import org.bukkit.entity.Player;
import org.bukkit.event.Cancellable;
import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
import org.bukkit.event.Listener;
import org.bukkit.event.block.Action;
import org.bukkit.event.player.PlayerAnimationEvent;
import org.bukkit.event.player.PlayerAnimationType;
import org.bukkit.event.player.PlayerEvent;
import org.bukkit.event.player.PlayerInteractEvent;
import org.bukkit.inventory.Inventory;
import org.bukkit.inventory.ItemStack;
import java.util.Set;
import java.util.UUID;
import static com.Acrobot.Breeze.Utils.BlockUtil.isChest;
@ -47,15 +52,29 @@ import static org.bukkit.event.block.Action.RIGHT_CLICK_BLOCK;
public class PlayerInteract implements Listener {
@EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
public static void onInteract(PlayerInteractEvent event)
{
public static void onInteract(PlayerInteractEvent event) {
Block block = event.getClickedBlock();
if (block == null)
return;
Action action = event.getAction();
Player player = event.getPlayer();
// Make sure that event isn't handled twice when the adventure mdoe workaround is used
if (event.getPlayer().getGameMode() != GameMode.ADVENTURE || event.getAction() != Action.LEFT_CLICK_BLOCK) {
handleEvent(event, event.getPlayer(), block, event.getAction());
}
}
// Workaround for adventure mode not sending left clicks to the server
@EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
public static void onAnimation(PlayerAnimationEvent event) {
if (event.getPlayer().getGameMode() == GameMode.ADVENTURE && event.getAnimationType() == PlayerAnimationType.ARM_SWING) {
Block block = event.getPlayer().getTargetBlock((Set<Material>) null, 5);
if (block == null)
return;
handleEvent(event, event.getPlayer(), block, Action.LEFT_CLICK_BLOCK);
}
}
private static void handleEvent(Cancellable event, Player player, Block block, Action action) {
if (Properties.USE_BUILT_IN_PROTECTION && isChest(block)) {
if (Properties.TURN_OFF_DEFAULT_PROTECTION_WHEN_PROTECTED_EXTERNALLY) {
return;