Bunch of fixes for arbitrary things.

Only some of them I made. Okay most of them were me. Fixes ezeiger92/Bukkit-Prism#3
ezeiger92 · Jan 27, 2018 · 6ae1362 · 6ae1362
1 parent 4d19146
commit 6ae1362
Show file tree

Hide file tree

Showing 7 changed files with 254 additions and 195 deletions.
diff --git a/pom.xml b/pom.xml
@@ -5,6 +5,9 @@
 	<artifactId>prism</artifactId>
 	<version>2.1.0</version>
 	<name>prism</name>
+	<properties>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+	</properties>
 	<dependencies>
 		<!-- <dependency>
 			<groupId>us.dhmc</groupId>

diff --git a/src/main/java/me/botsko/prism/Prism.java b/src/main/java/me/botsko/prism/Prism.java
@@ -327,7 +327,8 @@ public DataSource initDbPool() {
         DataSource pool = null;
 
         final String dns = "jdbc:mysql://" + config.getString( "prism.mysql.hostname" ) + ":"
-                + config.getString( "prism.mysql.port" ) + "/" + config.getString( "prism.mysql.database" ) + "?useUnicode=true&characterEncoding=UTF-8";
+                + config.getString( "prism.mysql.port" ) + "/" + config.getString( "prism.mysql.database" )
+                + "?useUnicode=true&characterEncoding=UTF-8&useSSL=false";
         pool = new DataSource();
         pool.setDriverClassName( "com.mysql.jdbc.Driver" );
         pool.setUrl( dns );

diff --git a/src/main/java/me/botsko/prism/actionlibs/RecordingTask.java b/src/main/java/me/botsko/prism/actionlibs/RecordingTask.java
@@ -235,9 +235,9 @@ public void insertActionsIntoDatabase() {
 
                     // TODO: Lookup name and get id
                     @SuppressWarnings("deprecation")
-        			int newId = a.getBlock().getId();
+        			int newId = a.getBlock() != null ? a.getBlock().getId() : 0;
                     @SuppressWarnings("deprecation")
-        			int oldId = a.getOldBlock().getId();
+        			int oldId = a.getOldBlock() != null ? a.getOldBlock().getId() : 0;
 
                     s.setInt( 5, newId );
                     s.setInt( 6, a.getBlockSubId() );