Skip to content

Commit 7c3893c

Browse files
authored
Warn on strange @eventhandler return types (#7372)
1 parent f1db23e commit 7c3893c

File tree

1 file changed

+23
-0
lines changed

1 file changed

+23
-0
lines changed
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
2+
From: Jason Penilla <11360596+jpenilla@users.noreply.github.com>
3+
Date: Tue, 18 Jan 2022 11:07:54 -0700
4+
Subject: [PATCH] Warn on strange @EventHandler return types
5+
6+
7+
diff --git a/src/main/java/org/bukkit/plugin/EventExecutor.java b/src/main/java/org/bukkit/plugin/EventExecutor.java
8+
index 9026e108ccd3a88aee1267ee275137befa646455..e5f10ed4312529c082acf7de44af3639f77c8b8e 100644
9+
--- a/src/main/java/org/bukkit/plugin/EventExecutor.java
10+
+++ b/src/main/java/org/bukkit/plugin/EventExecutor.java
11+
@@ -51,6 +51,12 @@ public interface EventExecutor {
12+
Preconditions.checkArgument(m.getParameterCount() != 0, "Incorrect number of arguments %s", m.getParameterCount());
13+
Preconditions.checkArgument(m.getParameterTypes()[0] == eventClass, "First parameter %s doesn't match event class %s", m.getParameterTypes()[0], eventClass);
14+
ClassDefiner definer = ClassDefiner.getInstance();
15+
+ if (m.getReturnType() != Void.TYPE) {
16+
+ final org.bukkit.plugin.java.JavaPlugin plugin = org.bukkit.plugin.java.JavaPlugin.getProvidingPlugin(m.getDeclaringClass());
17+
+ org.bukkit.Bukkit.getLogger().warning("@EventHandler method " + m.getDeclaringClass().getName() + (Modifier.isStatic(m.getModifiers()) ? '.' : '#') + m.getName()
18+
+ + " returns non-void type " + m.getReturnType().getName() + ". This is an unsupported behavior which will be removed in a future version of Paper."
19+
+ + "This should be reported to the developers of " + plugin.getDescription().getFullName() + ", (" + String.join(",", plugin.getDescription().getAuthors()) + ')');
20+
+ }
21+
if (Modifier.isStatic(m.getModifiers())) {
22+
return new StaticMethodHandleEventExecutor(eventClass, m);
23+
} else if (definer.isBypassAccessChecks() || Modifier.isPublic(m.getDeclaringClass().getModifiers()) && Modifier.isPublic(m.getModifiers())) {

0 commit comments

Comments
 (0)