Fix version bump not obeying merge commit message (#157) #patch

* Fix version bump not obeying merge commit message

* Test the fix to bump-version

* Fix reference to specific tag of github-tag-action

* Dummy patch commit #patch

* Clean up testing of bump-version

.github/workflows/bump-version.yml

@@ -1,10 +1,9 @@
 # This workflow will tag the merge commit when merging a PR into the master branch.
+# Add "#patch", "#minor", or "#major" at end of the merge commit subject to dictate the type of bump.
 
 name: Bump version
 on:
-  pull_request:
-    types:
-      - closed
+  push:
     branches:
       - master
 
@@ -18,7 +17,8 @@ jobs:
           fetch-depth: '0'
 
       - name: Bump version and push tag
-        uses: anothrNick/github-tag-action@v1
+        uses: anothrNick/github-tag-action@1.55.0
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          WITH_V: true
+          WITH_V: true
+          BRANCH_HISTORY: last

scripts/npc/9201115.js

@@ -35,11 +35,13 @@ function action(mode, type, selection) {
                 cm.mapMessage(6, "Engarde! Master Guardians approach!");
                 for (var i = 0; i < 10; i++) {
                     var mob = eim.getMonster(9400594);
-                    cm.getMap().spawnMonsterOnGroundBelow(mob, new java.awt.Point(-1337 + (Math.random() * 1337), 276));
+                    const xPos = Math.floor(-1337 + (Math.random() * 1337))
+                    cm.getMap().spawnMonsterOnGroundBelow(mob, new java.awt.Point(xPos, 276));
                 }
                 for (var i = 0; i < 20; i++) {
                     var mob = eim.getMonster(9400582);
-                    cm.getMap().spawnMonsterOnGroundBelow(mob, new java.awt.Point(-1337 + (Math.random() * 1337), 276));
+                    const xPos = Math.floor(-1337 + (Math.random() * 1337))
+                    cm.getMap().spawnMonsterOnGroundBelow(mob, new java.awt.Point(xPos, 276));
                 }
                 eim.setIntProperty("glpq6", 1);
                 cm.dispose();

src/main/java/net/server/channel/handlers/ReportHandler.java

@@ -32,7 +32,8 @@ import tools.PacketCreator;
 import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
-import java.time.OffsetDateTime;
+import java.sql.Timestamp;
+import java.time.Instant;
 
 /*
  *
@@ -40,7 +41,7 @@ import java.time.OffsetDateTime;
  */
 public final class ReportHandler extends AbstractPacketHandler {
     public final void handlePacket(InPacket p, Client c) {
-        int type = p.readByte(); //01 = Conversation claim 00 = illegal program
+        int type = p.readByte(); //00 = Illegal program claim, 01 = Conversation claim
         String victim = p.readString();
         int reason = p.readByte();
         String description = p.readString();
@@ -58,7 +59,7 @@ public final class ReportHandler extends AbstractPacketHandler {
                 return;
             }
             Server.getInstance().broadcastGMMessage(c.getWorld(), PacketCreator.serverNotice(6, victim + " was reported for: " + description));
-            addReport(c.getPlayer().getId(), Character.getIdByName(victim), 0, description, null);
+            addReport(c.getPlayer().getId(), Character.getIdByName(victim), 0, description, "");
         } else if (type == 1) {
             String chatlog = p.readString();
             if (chatlog == null) {
@@ -80,17 +81,16 @@ public final class ReportHandler extends AbstractPacketHandler {
         }
     }
 
-    public void addReport(int reporterid, int victimid, int reason, String description, String chatlog) {
+    private void addReport(int reporterid, int victimid, int reason, String description, String chatlog) {
         try (Connection con = DatabaseConnection.getConnection();
              PreparedStatement ps = con.prepareStatement("INSERT INTO reports (`reporttime`, `reporterid`, `victimid`, `reason`, `chatlog`, `description`) VALUES (?, ?, ?, ?, ?, ?)")) {
-            ps.setString(1, OffsetDateTime.now().toString());
+            ps.setTimestamp(1, Timestamp.from(Instant.now()));
             ps.setInt(2, reporterid);
             ps.setInt(3, victimid);
             ps.setInt(4, reason);
             ps.setString(5, chatlog);
             ps.setString(6, description);
-            ps.addBatch();
-            ps.executeBatch();
+            ps.executeUpdate();
         } catch (SQLException ex) {
             ex.printStackTrace();
         }