Sync with L2jServer HighFive Apr 1st 2015.

2015-04-02 04:12:06 +00:00
parent 8300183361
commit 1abccfcae0
26 changed files with 283 additions and 248 deletions
--- a/trunk/java/com/l2jserver/gameserver/model/events/EventDispatcher.java
+++ b/trunk/java/com/l2jserver/gameserver/model/events/EventDispatcher.java
@ -160,13 +160,13 @@ public final class EventDispatcher
 	 */
 	private <T extends AbstractEventReturn> T notifyEventToMultipleContainers(IBaseEvent event, ListenersContainer[] containers, Class<T> callbackClass)
 	{
+		if (event == null)
+		{
+			throw new NullPointerException("Event cannot be null!");
+		}
+		
 		try
 		{
-			if (event == null)
-			{
-				throw new NullPointerException("Event cannot be null!");
-			}
-			
 			T callback = null;
 			if (containers != null)
 			{