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

Merge remote-tracking branch 'remotes/origin/commanding' into commanding

Browse Source 
# Conflicts:
#	worldedit-core/src/main/java/com/sk89q/worldedit/command/ChunkCommands.java
#	worldedit-core/src/main/java/com/sk89q/worldedit/command/UtilityCommands.java
This commit is contained in:
MattBDev
2019-07-29 10:58:41 -04:00
parent ca54f8c371 02d5f3e8d5
commit 7f51791d6c
9 changed files with 74 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
worldedit-core/src/main/java/com/sk89q/worldedit/extension/platform/PlatformManager.java
View File

@ -333,7 +333,7 @@ public class PlatformManager {
case HIT: {
// superpickaxe is special because its primary interaction is a left click, not a right click
// in addition, it is implicitly bound to all pickaxe items, not just a single tool item
if (session.hasSuperPickAxe() && player.isHoldingPickAxe()) {
if (session.hasSuperPickAxe()) {
final BlockTool superPickaxe = session.getSuperPickaxe();
if (superPickaxe != null && superPickaxe.canUse(player) && player.isHoldingPickAxe()) {
FawePlayer<?> fp = FawePlayer.wrap(player);