Don’t load properties if there is no object.

diff --git a/src/main/java/net/pterodactylus/demoscenemusic/data/DataManager.java b/src/main/java/net/pterodactylus/demoscenemusic/data/DataManager.java
index f5b071f..f3d3578 100644 (file)
--- a/src/main/java/net/pterodactylus/demoscenemusic/data/DataManager.java
+++ b/src/main/java/net/pterodactylus/demoscenemusic/data/DataManager.java
@@ -808,6 +808,9 @@ public class DataManager {
         *             if a database error occurs
         */
        private <T extends Base> T loadProperties(final T object, final String table, String type) throws DatabaseException {
         *             if a database error occurs
         */
        private <T extends Base> T loadProperties(final T object, final String table, String type) throws DatabaseException {

+               if (object == null) {
+                       return null;
+               }

                Query query = new Query(Type.SELECT, table);
                query.addField(new Field(table + ".PROPERTY"));
                query.addField(new Field(table + ".VALUE"));
                Query query = new Query(Type.SELECT, table);
                query.addField(new Field(table + ".PROPERTY"));
                query.addField(new Field(table + ".VALUE"));