diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
deleted file mode 100644
index bbe3cacfd..000000000
--- a/.github/ISSUE_TEMPLATE.md
+++ /dev/null
@@ -1,41 +0,0 @@
-<!--
-Don't put anything inside this block, as it won't be included in the issue.
-
-If you have a question about using EssentialsX, it may be more helpful to ask
-in our Discord server: https://discord.gg/F7gexAQ
-
-If you have a feature suggestion for EssentialsX, please delete the template.
-
-Otherwise, if you are reporting a bug, read on:
-1.  Fill out the template, running the commands either in the console or 
-    as a player. Don't simply put "latest" or we will ignore it.
-
-2.  When linking files, do not attach them to the post! Paste them on 
-    https://gist.github.com/, then paste a link to them in the relevant parts
-    of the template. Avoid using Hastebin or Pastebin, as files are deleted
-    after a period of time.
-
-3.  If you are reporting an issue with lag, please include a timings report.
-
-4.  If you are reporting an issue with messages or in-game behaviour, please
-    include screenshots detailing the problem.
-
-5.  Include a description and any other details that may be helpful under the
-    Details section.
-
-6.  Delete this line and all above lines before posting your issue!       -->
-
-### Information
-
-Full output of `/ess version`:
-
-
-
-
-Server log (upload `logs/latest.log` to [Gist](https://gist.github.com/)):
-
-EssentialsX config (upload `plugins/Essentials/config.yml` to [Gist](https://gist.github.com/)): 
-
-### Details
-
-Describe your issue here.
diff --git a/.github/ISSUE_TEMPLATE/help.md b/.github/ISSUE_TEMPLATE/help.md
new file mode 100644
index 000000000..4d6afa037
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/help.md
@@ -0,0 +1,45 @@
+---
+name: Help!
+about: Encountered a problem with EssentialsX? Not sure how to fix it?
+
+---
+
+<!-- EssentialsX help guide
+
+Don't write inside the arrows as they will be hidden when you post your issue.
+
+Want faster support? Come join our Discord server to get help sooner:
+https://discord.gg/F7gexAQ
+
+If you're happy to wait (or you were sent here from Discord), read on:
+
+1.  Fill out the template.
+      This will help us understand what problem you've encountered and help us
+      find a solution.
+
+2.  Check the Common Issues page.
+      Read through the wiki page to see if you've encountered a regular issue:
+      https://essentialsx.github.io/#/Common-Issues
+
+3.  Delete this line and all above lines before posting your issue!       -->
+
+### Information
+
+Full output of `/ess version`:
+
+<!-- Replace this with the command output -->
+
+**Server log:** <!-- Upload `logs/latest.log` to https://gist.github.com/ -->
+
+**EssentialsX config** <!-- Upload `plugins/Essentials/config.yml` to https://gist.github.com/ -->
+
+### Help request
+
+**Problem**
+<!-- What problem did you encounter? -->
+
+**What I have tried**
+<!-- What have you tried so far? -->
+
+**Screenshots**
+<!-- If relevant, include any screenshots here. -->
diff --git a/.github/ISSUE_TEMPLATE/report-a-bug.md b/.github/ISSUE_TEMPLATE/report-a-bug.md
new file mode 100644
index 000000000..e3b382729
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/report-a-bug.md
@@ -0,0 +1,58 @@
+---
+name: Report a bug
+about: Report an EssentialsX bug. Only use this if you're 100% sure there's something wrong with EssentialsX - otherwise, try "Help!".
+
+---
+
+<!-- EssentialsX bug reporting guide
+
+Don't put anything inside this block, as it won't be included in the issue.
+
+If you are reporting a bug, please follow the following steps:
+
+1.  Fill out the template in full.
+      Run the commands in the console. Don't just put "latest" as a version,
+      or we will ignore it.
+
+2.  When linking files, do not attach them to the post!
+      Copy and paste any logs into https://gist.github.com/, then paste a
+      link to them in the relevant parts of the template. Avoid using
+      Hastebin or Pastebin, as this makes providing support more difficult.
+      **DO NOT drag files into this box!**
+
+3.  If you are reporting a performance issue, please include a link to a
+    Timings and/or profiler report.
+
+4.  If you are reporting a bug with commands or something else in-game,
+    please include screenshots to help us diagnose the problem.
+
+5.  Make sure not to write between the arrows, as anything there will be
+    hidden.
+
+6.  Delete this line and all above lines before posting your issue!       -->
+
+### Information
+
+**Full output of `/ess version`**:
+
+```
+<!-- Run the command in your console, and copy and paste the whole output here -->
+```
+
+**Server log**: <!-- Upload `logs/latest.log` to https://gist.github.com/, replace this with link -->
+
+**EssentialsX config**: <!-- Upload `plugins/Essentials/config.yml` to https://gist.github.com/, replace this with link -->
+
+### Details
+
+**Description**  
+<!-- Replace this with a brief summary of the bug. -->
+
+**Steps to reproduce**  
+<!-- Replace this with exactly what you did to cause the bug. -->
+
+**Expected behavior**  
+<!-- Replace this with what you expected to happen. -->
+
+**Screenshots**  
+<!-- Replace this with screenshots, if necessary. -->
diff --git a/.github/ISSUE_TEMPLATE/request-a-feature.md b/.github/ISSUE_TEMPLATE/request-a-feature.md
new file mode 100644
index 000000000..8adc6dd90
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/request-a-feature.md
@@ -0,0 +1,45 @@
+---
+name: Request a feature
+about: Suggest a feature you want to see in EssentialsX!
+
+---
+
+<!-- EssentialsX feature request guide
+
+Fill out the template. Don't write inside the arrows as they will be hidden
+when you post your issue.
+
+Not sure if your feature fits in EssentialsX? Feel free to ask on our Discord
+server: https://discord.gg/F7gexAQ
+
+If you have a feature suggestion for EssentialsX, read the following tips:
+
+1.  Fill out the template.
+      This will help us understand what you're requesting and why you want us
+      to add it.
+
+2.  Keep it simple.
+      Make sure it's easy to understand what you're requesting. A good way is
+      to keep it to one request per GitHub issue, as we can then easily track
+      feature requests.
+
+3.  Check whether it has already been asked or added.
+      You can search the issue tracker to see if your feature has already been
+      requested at https://github.com/EssentialsX/Essentials/issues. You can
+      also check the wiki at https://essentialsx.github.io/ to see if the
+      feature was recently added.
+
+4.  Ask yourself: "Does this belong in EssentialsX?"
+      There are lots of features that we reject because most servers won't
+      need or use them. If your feature is very specific or already exists in
+      another plugin, it might not be a good fit for EssentialsX.
+
+5.  Delete this line and all above lines before posting your issue!       -->
+
+### Feature request
+
+**Feature description**
+<!-- What feature are you suggesting? -->
+
+**How the feature is useful**
+<!-- How is the feature useful to players, server owners and/or developers? -->
diff --git a/Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java b/Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java
index 03fe03ce3..d385640e4 100644
--- a/Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java
+++ b/Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java
@@ -8,7 +8,6 @@ import com.earth2me.essentials.utils.DateUtil;
 import com.earth2me.essentials.utils.LocationUtil;
 import com.earth2me.essentials.utils.MaterialUtil;
 import net.ess3.api.IEssentials;
-import net.ess3.nms.refl.ReflUtil;
 
 import org.bukkit.BanEntry;
 import org.bukkit.BanList;
@@ -58,10 +57,10 @@ public class EssentialsPlayerListener implements Listener {
 
     public void registerEvents() {
         ess.getServer().getPluginManager().registerEvents(this, ess);
-        if (ReflUtil.getNmsVersionObject().isLowerThan(ReflUtil.V1_12_R1)) {
-            ess.getServer().getPluginManager().registerEvents(new PlayerListenerPre1_12(), ess);
-        } else {
+        if (isEntityPickupEvent()) {
             ess.getServer().getPluginManager().registerEvents(new PlayerListener1_12(), ess);
+        } else {
+            ess.getServer().getPluginManager().registerEvents(new PlayerListenerPre1_12(), ess);
         }
     }
 
@@ -787,6 +786,15 @@ public class EssentialsPlayerListener implements Listener {
             user.updateActivityOnInteract(true);
     }
 
+    private static boolean isEntityPickupEvent() {
+        try {
+            Class.forName("org.bukkit.event.entity.EntityPickupItemEvent");
+            return true;
+        } catch (ClassNotFoundException ignored) {
+            return false;
+        }
+    }
+
     private final class PlayerListenerPre1_12 implements Listener {
 
         @EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)