Merge pull request #674 from Multiverse/fix/hk2-contract

Fix @contract annotation

Author: benwoo1110

src/main/java/org/mvplugins/multiverse/portals/commands/PortalsCommand.java

@@ -1,10 +1,8 @@
 package org.mvplugins.multiverse.portals.commands;
 
-import org.mvplugins.multiverse.core.command.MVCommandManager;
+import org.jvnet.hk2.annotations.Contract;
 import org.mvplugins.multiverse.core.command.MultiverseCommand;
 import org.mvplugins.multiverse.external.acf.commands.annotation.CommandAlias;
-import org.mvplugins.multiverse.external.jetbrains.annotations.NotNull;
-import org.mvplugins.multiverse.external.jvnet.hk2.annotations.Contract;
 
 /**
  * Base class for all portal commands

src/main/java/org/mvplugins/multiverse/portals/listeners/PortalsListener.java

@@ -1,7 +1,7 @@
 package org.mvplugins.multiverse.portals.listeners;
 
 import org.bukkit.event.Listener;
-import org.mvplugins.multiverse.external.jvnet.hk2.annotations.Contract;
+import org.jvnet.hk2.annotations.Contract;
 
 /**
  * Base implementation for all portal listeners