From c5d675d2a0dd61ab7a11b233fbdc216ed0d63b52 Mon Sep 17 00:00:00 2001
From: Risto Lahtela <24460436+AuroraLS3@users.noreply.github.com>
Date: Fri, 12 Feb 2021 12:48:56 +0200
Subject: [PATCH] Blocked placeholder replacement for Plan on server thread

Affects issues:
- Fixed #1694
---
 .../addons/placeholderapi/PlanPlaceholderExtension.java  | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/Plan/bukkit/src/main/java/com/djrapitops/plan/addons/placeholderapi/PlanPlaceholderExtension.java b/Plan/bukkit/src/main/java/com/djrapitops/plan/addons/placeholderapi/PlanPlaceholderExtension.java
index 41d702be6..c3e3805f0 100644
--- a/Plan/bukkit/src/main/java/com/djrapitops/plan/addons/placeholderapi/PlanPlaceholderExtension.java
+++ b/Plan/bukkit/src/main/java/com/djrapitops/plan/addons/placeholderapi/PlanPlaceholderExtension.java
@@ -65,12 +65,6 @@ public class PlanPlaceholderExtension extends PlaceholderExpansion {
         return "plan";
     }
 
-    @SuppressWarnings("deprecation")
-    @Override
-    public String getPlugin() {
-        return "Plan";
-    }
-
     @Override
     public String getAuthor() {
         return "Rsl1122";
@@ -84,6 +78,9 @@ public class PlanPlaceholderExtension extends PlaceholderExpansion {
     @Override
     public String onPlaceholderRequest(Player player, String params) {
         UUID uuid = player != null ? player.getUniqueId() : null;
+        if ("Server thread".equalsIgnoreCase(Thread.currentThread().getName())) {
+            return "[placeholder replacement on server thread is not supported by Plan because it can crash the server!]";
+        }
         try {
             String value = placeholders.onPlaceholderRequest(uuid, params, Collections.emptyList());