Merge branch 'clans/alpha' of http://184.154.0.242:7990/scm/min/mineplex into clans/alpha

This commit is contained in:
phobia 2016-02-05 10:12:31 +11:00
commit 73d4ff2639

View File

@ -403,7 +403,7 @@ public class ClansCommand extends CommandBase<ClansManager>
{
UtilPlayer.message(client.getPlayer(), F.main("Clans", "Teleport has been cancelled due to movement."));
}
}, 7 * 1000, false);
}, 2 * 60 * 1000, false);
}