Skip to content

Commit

Permalink
Merge pull request #4963 from bubblobill/campMoveMacro
Browse files Browse the repository at this point in the history
Fixed ButtonGroup drag event drop checks #4959
  • Loading branch information
cwisniew authored Oct 2, 2024
2 parents 8c88df5 + 3581951 commit a534820
Showing 1 changed file with 2 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -128,8 +128,8 @@ public void drop(DropTargetDropEvent event) {
MacroButtonProperties oldMacroProps = new MacroButtonProperties(tempProperties);

// stops players from moving macros into/from the Campaign/GM panels
// debounce first, ignore moves that change nothing
if (tempProperties.getGroup().equals(getMacroGroup())) {
// debounce first, ignore moves to the same group in the same panel
if (tempProperties.getGroup().equals(getMacroGroup()) && data.panelClass.equals(panelClass)) {
event.dropComplete(false);
} else if (!MapTool.getPlayer().isGM()
&& (panelClass.equals("CampaignPanel")
Expand Down

0 comments on commit a534820

Please sign in to comment.