Final 669 build

vasl-developers · Nov 5, 2024 · 16ac085 · 16ac085
1 parent 18f1bb9
commit 16ac085
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/src/VASL/build/module/ASLChatter.java b/src/VASL/build/module/ASLChatter.java
@@ -693,7 +693,7 @@ else if (firstDie == 6 && secondDie == 6) {
 
                                     if (showDiceStats) {
                                         int endidx = restOfMsg.indexOf("R");
-                                        msgpartRest = restOfMsg.substring(0, endidx);
+                                        msgpartRest = (endidx == -1 ? restOfMsg : restOfMsg.substring(0, endidx));
                                     }
                                     if ((Boolean) GameModule.getGameModule().getPrefs().getValue((SHOW_ROF_DIE))) {
                                         if ("TH".equals(category) || ("IFT".equals(category))) {
@@ -709,6 +709,8 @@ else if (firstDie == 6 && secondDie == 6) {
                                                 restOfMsg = restOfMsg.substring(startidx);
                                                 msgpartROFDie = restOfMsg;
                                             }
+                                        } else {
+
                                         }
                                     }
                                     fireDiceRoll(otherDice);

diff --git a/src/VASL/build/module/map/ASLPieceMover.java b/src/VASL/build/module/map/ASLPieceMover.java
@@ -1650,17 +1650,17 @@ protected void makeDragCursor(double zoom, double os_scale) {
          * @param dragX x position
          * @param dragY y position
          */
-        @Override
+        /*@Override
         protected void moveDragCursor(int dragX, int dragY) {
             if (drawWin != null) {
                 dragCursor.setLocation(dragX - drawOffset.x, dragY - drawOffset.y);
             }
-        }
+        }*/
 
         /**
          * Removes the drag cursor from the current draw window
          */
-        @Override
+        /*@Override
         protected void removeDragCursor() {
             if (drawWin != null) {
                 if (dragCursor != null) {
@@ -1669,7 +1669,7 @@ protected void removeDragCursor() {
                 }
                 drawWin = null;
             }
-        }
+        }*/
 
         /**
          * creates or moves cursor object to given JLayeredPane. Usually called by setDrawWinToOwnerOf()