diff --git a/l2jserver2-common/pom.xml b/l2jserver2-common/pom.xml index 9086e6668..4eda6c3d4 100644 --- a/l2jserver2-common/pom.xml +++ b/l2jserver2-common/pom.xml @@ -90,7 +90,7 @@ com.google.guava guava - 10.0 + 10.0.1 commons-io diff --git a/l2jserver2-gameserver/pom.xml b/l2jserver2-gameserver/pom.xml index 81efe813f..d67e0cc76 100644 --- a/l2jserver2-gameserver/pom.xml +++ b/l2jserver2-gameserver/pom.xml @@ -100,24 +100,6 @@ 3.2.4.Final - - com.google.inject - guice - 3.0 - jar - - - com.google.inject.extensions - guice-assistedinject - 3.0 - jar - - - com.google.inject.extensions - guice-multibindings - 3.0 - jar - org.slf4j @@ -126,12 +108,6 @@ jar runtime - - org.slf4j - jcl-over-slf4j - 1.6.1 - jar - mysql @@ -159,12 +135,6 @@ 1.0rc5 jar - - commons-dbcp - commons-dbcp - 1.4 - jar - net.sf.ehcache @@ -186,42 +156,6 @@ - - javolution - javolution - 5.5.1 - jar - - - com.google.guava - guava - r09 - jar - - - commons-io - commons-io - 2.0.1 - jar - - - commons-pool - commons-pool - 1.5.6 - jar - - - commons-collections - commons-collections - 3.2.1 - jar - - - org.apache.commons - commons-math - 2.2 - jar - org.eclipse.jdt.core.compiler ecj diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/world/event/WorldEventDispatcherImpl.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/world/event/WorldEventDispatcherImpl.java index 514490a6c..6076759f0 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/world/event/WorldEventDispatcherImpl.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/world/event/WorldEventDispatcherImpl.java @@ -284,7 +284,7 @@ public class WorldEventDispatcherImpl implements WorldEventDispatcher { return false; if (complete) return false; - return cancel(); + return cancel(mayInterruptIfRunning); } @Override