From d1b78d32df8fb7b877964978edee8fc8dd53f8df Mon Sep 17 00:00:00 2001
From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Wed, 27 Apr 2016 11:59:44 +0000
Subject: [PATCH] AbstractEventListener executeEvent should invoke before cast
 return.

---
 .../model/events/listeners/AnnotationEventListener.java        | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/trunk/java/com/l2jmobius/gameserver/model/events/listeners/AnnotationEventListener.java b/trunk/java/com/l2jmobius/gameserver/model/events/listeners/AnnotationEventListener.java
index 422f44d4bd..f5eb497106 100644
--- a/trunk/java/com/l2jmobius/gameserver/model/events/listeners/AnnotationEventListener.java
+++ b/trunk/java/com/l2jmobius/gameserver/model/events/listeners/AnnotationEventListener.java
@@ -46,9 +46,10 @@ public class AnnotationEventListener extends AbstractEventListener
 	{
 		try
 		{
+			final Object result = _callback.invoke(getOwner(), event);
 			if (_callback.getReturnType() == returnBackClass)
 			{
-				return returnBackClass.cast(_callback.invoke(getOwner(), event));
+				return returnBackClass.cast(result);
 			}
 		}
 		catch (Exception e)