From e4aad8b597950e92fb702a27c56f7b0cbc8497af Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Sun, 12 Jan 2020 01:08:38 +0100 Subject: [PATCH 1/3] Not needed stuff --- src/main/java/com/bbn/hadder/Rethink.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/bbn/hadder/Rethink.java b/src/main/java/com/bbn/hadder/Rethink.java index 5ff7c94..f51814e 100644 --- a/src/main/java/com/bbn/hadder/Rethink.java +++ b/src/main/java/com/bbn/hadder/Rethink.java @@ -62,25 +62,25 @@ public class Rethink { else return null; } - public void update(String table, String value, String what, String whatvalue) { + public void update(String table, String where, String what, String value) { try { - r.table(table).get(value).update(r.hashMap(what, whatvalue)).run(conn); + r.table(table).get(where).update(r.hashMap(what, value)).run(conn); } catch (ClassCastException e) { e.printStackTrace(); } } - public void update(String table, String value, String what, int whatvalue) { + public void update(String table, String where, String what, int value) { try { - r.table(table).get(value).update(r.hashMap(what, whatvalue)).run(conn); + r.table(table).get(where).update(r.hashMap(what, value)).run(conn); } catch (ClassCastException e) { e.printStackTrace(); } } - public void update(String table, String value, String what, boolean whatvalue) { + public void update(String table, String where, String what, boolean value) { try { - r.table(table).get(value).update(r.hashMap(what, whatvalue)).run(conn); + r.table(table).get(where).update(r.hashMap(what, value)).run(conn); } catch (ClassCastException e) { e.printStackTrace(); } -- 2.45.3 From 0a7176a758fb26becba69ca2ed42dcc412ff99b5 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Mon, 13 Jan 2020 08:59:45 +0100 Subject: [PATCH 2/3] Update JDA version --- pom.xml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pom.xml b/pom.xml index 6926c73..f40ca41 100644 --- a/pom.xml +++ b/pom.xml @@ -15,11 +15,19 @@ 1.13 + + + jcenter + jcenter-bintray + https://jcenter.bintray.com + + + net.dv8tion JDA - 4.1.0_95 + 4.1.0_96 org.json @@ -53,14 +61,6 @@ - - - jcenter - jcenter-bintray - https://jcenter.bintray.com - - - -- 2.45.3 From 8c6d068770274584cdb2f3b46d2b11b5a8da3fcf Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Mon, 13 Jan 2020 19:35:16 +0100 Subject: [PATCH 3/3] stuff --- .github/workflows/maven.yml | 4 ++-- pom.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index a15e1a2..37a9d61 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -30,7 +30,7 @@ jobs: uses: garygrossgarten/github-action-scp@release with: local: ./target/Hadder-Build.jar - remote: /home/Bots/Hadder-Build.jar + remote: /home/Hadder-Build.jar host: ${{ secrets.HOST }} username: ${{ secrets.USERNAME }} password: ${{ secrets.PASSWORD }} @@ -41,7 +41,7 @@ jobs: username: ${{ secrets.USERNAME }} password: ${{ secrets.PASSWORD }} port: ${{ secrets.PORT }} - script: /home/Bots/deploy.sh + script: /home/deploy.sh - name: Send Webhook Notification if: always() env: diff --git a/pom.xml b/pom.xml index f40ca41..79cd707 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ net.dv8tion JDA - 4.1.0_96 + 4.1.0_95 org.json -- 2.45.3