diff --git a/.github/ISSUE_TEMPLATE/defect-report.md b/.github/ISSUE_TEMPLATE/defect-report.md
index 0ebbbf14..930f1aee 100644
--- a/.github/ISSUE_TEMPLATE/defect-report.md
+++ b/.github/ISSUE_TEMPLATE/defect-report.md
@@ -27,6 +27,12 @@ PUT SUPER LONG ERROR MESSAGES IN THE TICK MARKS
 
 #### Any screenshots?
 
-#### Any log messages from files that end in `.log`?
+<!-- Please add context. Even if you don't have an error message, please show a screenshot of the server console at least. -->
+
+<!-- If providing screenshots of client, send before and after pressing F8 to show network debug -->
+
+#### Any log messages from files that end in `.log` or `.txt`?
+
+<!-- Please add context. Even if you don't have an error message, please show recent server logs at least. -->
 
 #### What plugins and what versions of those plugins are you running?
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 10907698..9310765a 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -1,6 +1,6 @@
 name: Build Server
 
-on: [push]
+on: [push, pull_request]
 
 jobs:
   build:
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4a7aac44..48596cb3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 This is the rolling changelog for TShock for Terraria. Use past tense when adding new entries; sign your name off when you add or change something. This should primarily be things like user changes, not necessarily codebase changes unless it's really relevant or large.
 
+## Upcoming changes
+
+* Fixed NPC buff anticheat issue conflicting with Terraria gameplay changes (whips) (@Patrikkk)
+
 ## TShock 4.4.0 (Pre-release 1)
 * Added confused debuff to Bouncer for confusion applied from Brain of Confusion
 * API: Added return in OnNameCollision if hook has been handled. (@Patrikkk)
diff --git a/TerrariaServerAPI b/TerrariaServerAPI
index bf54cd2e..e39f6fe7 160000
--- a/TerrariaServerAPI
+++ b/TerrariaServerAPI
@@ -1 +1 @@
-Subproject commit bf54cd2eb1d4b7961b861e0c755e4e45331ba71a
+Subproject commit e39f6fe7526ddb6e67fe6c428e3614bae38d0c04