From e18807dc04d639965a5793fc5bc9f94253a6ad2e Mon Sep 17 00:00:00 2001
From: Bukkit/Spigot <noreply+git-bukkit@papermc.io>
Date: Wed, 29 Jan 2020 09:23:40 +1100
Subject: [PATCH] No longer necessary to synchronize sync events

By: md_5 <git@md-5.net>
---
 .../main/java/org/bukkit/plugin/SimplePluginManager.java  | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/paper-api/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/paper-api/src/main/java/org/bukkit/plugin/SimplePluginManager.java
index dbcbacb1b5..844adf5147 100644
--- a/paper-api/src/main/java/org/bukkit/plugin/SimplePluginManager.java
+++ b/paper-api/src/main/java/org/bukkit/plugin/SimplePluginManager.java
@@ -506,8 +506,6 @@ public final class SimplePluginManager implements PluginManager {
 
     /**
      * Calls an event with the given details.
-     * <p>
-     * This method only synchronizes when the event is not asynchronous.
      *
      * @param event Event details
      */
@@ -520,15 +518,13 @@ public final class SimplePluginManager implements PluginManager {
             if (server.isPrimaryThread()) {
                 throw new IllegalStateException(event.getEventName() + " cannot be triggered asynchronously from primary server thread.");
             }
-            fireEvent(event);
         } else {
             if (!server.isPrimaryThread()) {
                 throw new IllegalStateException(event.getEventName() + " cannot be triggered asynchronously from another thread.");
             }
-            synchronized (this) {
-                fireEvent(event);
-            }
         }
+
+        fireEvent(event);
     }
 
     private void fireEvent(@NotNull Event event) {