From 229252cd63ec9750d287f96ce394260c511f6fc5 Mon Sep 17 00:00:00 2001
From: P0nk <ponkcode@gmail.com>
Date: Thu, 11 Aug 2022 15:18:09 +0200
Subject: [PATCH] Fix deprecations

---
 src/main/java/client/command/CommandsExecutor.java     | 10 ++++------
 .../net/server/channel/handlers/ReportHandler.java     |  7 ++-----
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/src/main/java/client/command/CommandsExecutor.java b/src/main/java/client/command/CommandsExecutor.java
index 9287dbfbeb..6127052f90 100644
--- a/src/main/java/client/command/CommandsExecutor.java
+++ b/src/main/java/client/command/CommandsExecutor.java
@@ -126,7 +126,7 @@ public class CommandsExecutor {
 
     private void addCommandInfo(String name, Class<? extends Command> commandClass) {
         try {
-            levelCommandsCursor.getRight().add(commandClass.newInstance().getDescription());
+            levelCommandsCursor.getRight().add(commandClass.getDeclaredConstructor().newInstance().getDescription());
             levelCommandsCursor.getLeft().add(name);
         } catch (Exception e) {
             e.printStackTrace();
@@ -161,14 +161,12 @@ public class CommandsExecutor {
         addCommandInfo(commandName, commandClass);
 
         try {
-            Command commandInstance = commandClass.newInstance();     // thanks Halcyon for noticing commands getting reinstanced every call
+            Command commandInstance = commandClass.getDeclaredConstructor().newInstance();     // thanks Halcyon for noticing commands getting reinstanced every call
             commandInstance.setRank(rank);
 
             registeredCommands.put(commandName, commandInstance);
-        } catch (InstantiationException e) {
-            e.printStackTrace();
-        } catch (IllegalAccessException e) {
-            e.printStackTrace();
+        } catch (Exception e) {
+            log.warn("Failed to create command instance", e);
         }
     }
 
diff --git a/src/main/java/net/server/channel/handlers/ReportHandler.java b/src/main/java/net/server/channel/handlers/ReportHandler.java
index 23c4176243..feb34d1849 100644
--- a/src/main/java/net/server/channel/handlers/ReportHandler.java
+++ b/src/main/java/net/server/channel/handlers/ReportHandler.java
@@ -32,8 +32,7 @@ import tools.PacketCreator;
 import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
-import java.sql.Timestamp;
-import java.util.Calendar;
+import java.time.OffsetDateTime;
 
 /*
  *
@@ -82,11 +81,9 @@ public final class ReportHandler extends AbstractPacketHandler {
     }
 
     public void addReport(int reporterid, int victimid, int reason, String description, String chatlog) {
-        Calendar calendar = Calendar.getInstance();
-        Timestamp currentTimestamp = new java.sql.Timestamp(calendar.getTime().getTime());
         try (Connection con = DatabaseConnection.getConnection();
              PreparedStatement ps = con.prepareStatement("INSERT INTO reports (`reporttime`, `reporterid`, `victimid`, `reason`, `chatlog`, `description`) VALUES (?, ?, ?, ?, ?, ?)")) {
-            ps.setString(1, currentTimestamp.toGMTString());
+            ps.setString(1, OffsetDateTime.now().toString());
             ps.setInt(2, reporterid);
             ps.setInt(3, victimid);
             ps.setInt(4, reason);