AbstractEventListener executeEvent should invoke before cast return.

2016-04-27 11:59:44 +00:00
parent fc070c9238
commit d1b78d32df
1 changed files with 2 additions and 1 deletions
--- 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)