1.0.2.0.1 release commit

Exslims · Sep 3, 2017 · 8fd6d33 · 8fd6d33
1 parent f11871c
commit 8fd6d33
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 3 deletions.
diff --git a/app-core/src/main/java/com/mercury/platform/core/ChatHelper.java b/app-core/src/main/java/com/mercury/platform/core/ChatHelper.java
@@ -8,6 +8,7 @@
 import com.sun.jna.Native;
 import com.sun.jna.platform.win32.User32;
 
+import javax.swing.*;
 import java.awt.*;
 import java.awt.datatransfer.Clipboard;
 import java.awt.datatransfer.DataFlavor;
@@ -60,7 +61,7 @@ private void executeTradeMessage() {
         Clipboard clipboard = toolkit.getSystemClipboard();
         try {
             String result = (String) clipboard.getData(DataFlavor.stringFlavor);
-            if (result.contains("listed for") || result.contains("for my")) {
+            if (result != null && (result.contains("listed for") || result.contains("for my"))) {
                 this.gameToFront();
                 MercuryStoreCore.blockHotkeySubject.onNext(true);
                 robot.keyRelease(KeyEvent.VK_ALT);
@@ -81,6 +82,14 @@ private void executeTradeMessage() {
                 robot.keyRelease(KeyEvent.VK_CONTROL);
                 robot.keyPress(KeyEvent.VK_ENTER);
                 robot.keyRelease(KeyEvent.VK_ENTER);
+
+                Timer timer = new Timer(300, action -> {
+                    StringSelection selection = new StringSelection("");
+                    clipboard.setContents(selection, null);
+                });
+                timer.setRepeats(false);
+                timer.start();
+
                 MercuryStoreCore.blockHotkeySubject.onNext(false);
             }
         } catch (UnsupportedFlavorException | IOException e) {

diff --git a/app-core/src/main/java/com/mercury/platform/core/MercuryConstants.java b/app-core/src/main/java/com/mercury/platform/core/MercuryConstants.java
@@ -1,7 +1,7 @@
 package com.mercury.platform.core;
 
 public class MercuryConstants {
-    public static final String APP_VERSION = "1.0.2.0.0";
+    public static final String APP_VERSION = "1.0.2.0.1";
     public static final String SERVER_HOST = "exslims.ddns.net";
     public static final int PORT = 5555;
 }
diff --git a/...rc/main/java/com/mercury/platform/ui/components/panel/settings/page/SupportPagePanel.java b/...rc/main/java/com/mercury/platform/ui/components/panel/settings/page/SupportPagePanel.java
@@ -106,6 +106,7 @@ public void mouseWheelMoved(MouseWheelEvent e) {
     private List<DonationPair> getDonations() {
         List<DonationPair> donations = new ArrayList<>();
         donations.add(new DonationPair("222Craft", AppThemeColor.TEXT_DEFAULT));
+        donations.add(new DonationPair("Taw", AppThemeColor.TEXT_DEFAULT));
         donations.add(new DonationPair("Blightsand", AppThemeColor.TEXT_DEFAULT));
         donations.add(new DonationPair("StubenZocker", AppThemeColor.TEXT_DEFAULT));
         donations.add(new DonationPair("SirKultan", AppThemeColor.TEXT_DEFAULT));

diff --git a/app-ui/src/main/resources/notes/patch/patch-notes.json b/app-ui/src/main/resources/notes/patch/patch-notes.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.0.2.0.0",
+  "version": "1.0.2.0.1",
   "notes":[
     {
       "title": "Update",